Modified: accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java Thu Feb 28 21:49:31 2013 @@ -70,8 +70,6 @@ import org.apache.accumulo.core.client.A import org.apache.accumulo.core.client.Instance; import org.apache.accumulo.core.client.impl.TabletType; import org.apache.accumulo.core.client.impl.Translator; -import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode; -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.constraints.Constraint.Environment; @@ -105,7 +103,9 @@ import org.apache.accumulo.core.master.t import org.apache.accumulo.core.master.thrift.TabletServerStatus; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.SecurityUtil; +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.tabletserver.thrift.ActiveCompaction; import org.apache.accumulo.core.tabletserver.thrift.ActiveScan; import org.apache.accumulo.core.tabletserver.thrift.ConstraintViolationException;
Modified: accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/tabletserver/mastermessage/MasterMessage.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/tabletserver/mastermessage/MasterMessage.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/tabletserver/mastermessage/MasterMessage.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/tabletserver/mastermessage/MasterMessage.java Thu Feb 28 21:49:31 2013 @@ -16,9 +16,9 @@ */ package org.apache.accumulo.server.tabletserver.mastermessage; -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.thrift.TException; public interface MasterMessage { Modified: accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/tabletserver/mastermessage/SplitReportMessage.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/tabletserver/mastermessage/SplitReportMessage.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/tabletserver/mastermessage/SplitReportMessage.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/tabletserver/mastermessage/SplitReportMessage.java Thu Feb 28 21:49:31 2013 @@ -21,11 +21,11 @@ import java.util.TreeMap; import org.apache.accumulo.trace.instrument.Tracer; import org.apache.accumulo.core.client.impl.Translator; -import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException; import org.apache.accumulo.core.data.KeyExtent; import org.apache.accumulo.core.master.thrift.MasterClientService; import org.apache.accumulo.core.master.thrift.TabletSplit; import org.apache.accumulo.core.security.thrift.TCredentials; +import org.apache.accumulo.core.security.thrift.ThriftSecurityException; import org.apache.hadoop.io.Text; import org.apache.thrift.TException; Modified: accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/tabletserver/mastermessage/TabletStatusMessage.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/tabletserver/mastermessage/TabletStatusMessage.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/tabletserver/mastermessage/TabletStatusMessage.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/tabletserver/mastermessage/TabletStatusMessage.java Thu Feb 28 21:49:31 2013 @@ -17,11 +17,11 @@ package org.apache.accumulo.server.tabletserver.mastermessage; import org.apache.accumulo.trace.instrument.Tracer; -import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException; import org.apache.accumulo.core.data.KeyExtent; import org.apache.accumulo.core.master.thrift.TabletLoadState; import org.apache.accumulo.core.master.thrift.MasterClientService.Iface; import org.apache.accumulo.core.security.thrift.TCredentials; +import org.apache.accumulo.core.security.thrift.ThriftSecurityException; import org.apache.thrift.TException; public class TabletStatusMessage implements MasterMessage { Modified: accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/util/Initialize.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/util/Initialize.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/util/Initialize.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/util/Initialize.java Thu Feb 28 21:49:31 2013 @@ -28,7 +28,6 @@ import jline.ConsoleReader; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.cli.Help; import org.apache.accumulo.core.client.AccumuloSecurityException; -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.Key; @@ -41,6 +40,7 @@ import org.apache.accumulo.core.iterator import org.apache.accumulo.core.master.state.tables.TableState; import org.apache.accumulo.core.master.thrift.MasterGoalState; import org.apache.accumulo.core.security.SecurityUtil; +import org.apache.accumulo.core.security.thrift.ThriftSecurityException; import org.apache.accumulo.core.util.CachedConfiguration; import org.apache.accumulo.core.zookeeper.ZooUtil; import org.apache.accumulo.fate.zookeeper.IZooReaderWriter; Modified: accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/server/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java Thu Feb 28 21:49:31 2013 @@ -35,7 +35,6 @@ import org.apache.accumulo.core.client.A import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.Instance; import org.apache.accumulo.core.client.TableNotFoundException; -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.Range; @@ -46,6 +45,7 @@ import org.apache.accumulo.core.data.thr import org.apache.accumulo.core.data.thrift.TKeyExtent; import org.apache.accumulo.core.data.thrift.TRange; 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.ThriftUtil; Modified: accumulo/branches/ACCUMULO-259-polishing/server/src/test/java/org/apache/accumulo/server/gc/TestConfirmDeletes.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/server/src/test/java/org/apache/accumulo/server/gc/TestConfirmDeletes.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/server/src/test/java/org/apache/accumulo/server/gc/TestConfirmDeletes.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/server/src/test/java/org/apache/accumulo/server/gc/TestConfirmDeletes.java Thu Feb 28 21:49:31 2013 @@ -28,12 +28,12 @@ import org.apache.accumulo.core.client.C import org.apache.accumulo.core.client.Instance; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.client.mock.MockInstance; -import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.CredentialHelper; import org.apache.accumulo.core.security.thrift.TCredentials; +import org.apache.accumulo.core.security.tokens.PasswordToken; import org.apache.accumulo.core.util.CachedConfiguration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.io.Text; Modified: accumulo/branches/ACCUMULO-259-polishing/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java Thu Feb 28 21:49:31 2013 @@ -30,13 +30,13 @@ import org.apache.accumulo.core.client.I import org.apache.accumulo.core.client.MutationsRejectedException; import org.apache.accumulo.core.client.TableNotFoundException; import org.apache.accumulo.core.client.mock.MockInstance; -import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.data.KeyExtent; import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.CredentialHelper; import org.apache.accumulo.core.security.thrift.TCredentials; +import org.apache.accumulo.core.security.tokens.PasswordToken; import org.apache.accumulo.server.master.state.Assignment; import org.apache.accumulo.server.master.state.CurrentState; import org.apache.accumulo.server.master.state.MergeInfo; Modified: accumulo/branches/ACCUMULO-259-polishing/server/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/server/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/server/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/server/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java Thu Feb 28 21:49:31 2013 @@ -29,10 +29,10 @@ import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; -import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException; import org.apache.accumulo.core.data.KeyExtent; import org.apache.accumulo.core.master.thrift.TableInfo; import org.apache.accumulo.core.master.thrift.TabletServerStatus; +import org.apache.accumulo.core.security.thrift.ThriftSecurityException; import org.apache.accumulo.core.tabletserver.thrift.TabletStats; import org.apache.accumulo.core.util.AddressUtil; import org.apache.accumulo.server.master.state.TServerInstance; Modified: accumulo/branches/ACCUMULO-259-polishing/server/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/server/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/server/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/server/src/test/java/org/apache/accumulo/server/master/balancer/DefaultLoadBalancerTest.java Thu Feb 28 21:49:31 2013 @@ -29,10 +29,10 @@ import java.util.SortedMap; import java.util.TreeMap; import java.util.Map.Entry; -import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException; import org.apache.accumulo.core.data.KeyExtent; import org.apache.accumulo.core.master.thrift.TableInfo; import org.apache.accumulo.core.master.thrift.TabletServerStatus; +import org.apache.accumulo.core.security.thrift.ThriftSecurityException; import org.apache.accumulo.core.tabletserver.thrift.TabletStats; import org.apache.accumulo.core.util.AddressUtil; import org.apache.accumulo.server.master.balancer.DefaultLoadBalancer; Modified: accumulo/branches/ACCUMULO-259-polishing/server/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/server/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/server/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/server/src/test/java/org/apache/accumulo/server/master/balancer/TableLoadBalancerTest.java Thu Feb 28 21:49:31 2013 @@ -27,11 +27,11 @@ import java.util.TreeMap; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.admin.TableOperations; -import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException; import org.apache.accumulo.core.client.mock.MockInstance; import org.apache.accumulo.core.data.KeyExtent; import org.apache.accumulo.core.master.thrift.TableInfo; import org.apache.accumulo.core.master.thrift.TabletServerStatus; +import org.apache.accumulo.core.security.thrift.ThriftSecurityException; import org.apache.accumulo.core.tabletserver.thrift.TabletStats; import org.apache.accumulo.core.util.AddressUtil; import org.apache.accumulo.server.master.state.TServerInstance; Modified: accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/TestIngest.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/TestIngest.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/TestIngest.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/TestIngest.java Thu Feb 28 21:49:31 2013 @@ -29,7 +29,6 @@ import org.apache.accumulo.core.client.I import org.apache.accumulo.core.client.MutationsRejectedException; import org.apache.accumulo.core.client.TableNotFoundException; import org.apache.accumulo.core.client.impl.TabletServerBatchWriter; -import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.data.ConstraintViolationSummary; import org.apache.accumulo.core.data.Key; @@ -41,6 +40,7 @@ import org.apache.accumulo.core.file.Fil import org.apache.accumulo.core.file.rfile.RFile; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.ColumnVisibility; +import org.apache.accumulo.core.security.thrift.SecurityErrorCode; import org.apache.accumulo.core.trace.DistributedTrace; import org.apache.accumulo.core.util.CachedConfiguration; import org.apache.accumulo.core.util.FastFormat; Modified: accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationTest.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationTest.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationTest.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationTest.java Thu Feb 28 21:49:31 2013 @@ -20,9 +20,9 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; -import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.conf.Property; +import org.apache.accumulo.core.security.tokens.AuthenticationToken; +import org.apache.accumulo.core.security.tokens.PasswordToken; import org.apache.accumulo.core.util.CachedConfiguration; import org.apache.accumulo.core.util.UtilWaitThread; import org.apache.accumulo.test.CreateRFiles; Modified: accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTest.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTest.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTest.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTest.java Thu Feb 28 21:49:31 2013 @@ -34,14 +34,14 @@ import org.apache.accumulo.core.client.I import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.client.ZooKeeperInstance; import org.apache.accumulo.core.client.impl.Tables; -import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; -import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.CredentialHelper; +import org.apache.accumulo.core.security.tokens.AuthenticationToken; +import org.apache.accumulo.core.security.tokens.PasswordToken; import org.apache.accumulo.server.cli.ClientOpts; import org.apache.accumulo.server.conf.ServerConfiguration; import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader; Modified: accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/functional/PermissionsTest.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/functional/PermissionsTest.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/functional/PermissionsTest.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/functional/PermissionsTest.java Thu Feb 28 21:49:31 2013 @@ -38,8 +38,6 @@ import org.apache.accumulo.core.client.S import org.apache.accumulo.core.client.TableExistsException; import org.apache.accumulo.core.client.TableNotFoundException; import org.apache.accumulo.core.client.impl.Tables; -import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode; -import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Mutation; @@ -47,6 +45,8 @@ import org.apache.accumulo.core.data.Val 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.thrift.SecurityErrorCode; +import org.apache.accumulo.core.security.tokens.PasswordToken; import org.apache.accumulo.server.conf.ServerConfiguration; import org.apache.hadoop.io.Text; import org.apache.log4j.Logger; Modified: accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java Thu Feb 28 21:49:31 2013 @@ -23,10 +23,10 @@ import java.util.Random; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.Instance; -import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException; import org.apache.accumulo.core.master.thrift.TableInfo; import org.apache.accumulo.core.master.thrift.TabletServerStatus; import org.apache.accumulo.core.security.thrift.TCredentials; +import org.apache.accumulo.core.security.thrift.ThriftSecurityException; import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Iface; import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Processor; import org.apache.accumulo.core.util.AddressUtil; Modified: accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java Thu Feb 28 21:49:31 2013 @@ -29,8 +29,6 @@ import org.apache.accumulo.core.cli.Help import org.apache.accumulo.core.client.Instance; import org.apache.accumulo.core.client.ZooKeeperInstance; import org.apache.accumulo.core.client.impl.Tables; -import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException; -import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode; import org.apache.accumulo.core.conf.DefaultConfiguration; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.KeyExtent; @@ -49,6 +47,8 @@ import org.apache.accumulo.core.data.thr import org.apache.accumulo.core.data.thrift.UpdateErrors; import org.apache.accumulo.core.master.thrift.TabletServerStatus; 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.ActiveCompaction; import org.apache.accumulo.core.tabletserver.thrift.ActiveScan; import org.apache.accumulo.core.tabletserver.thrift.TabletClientService; Modified: accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java Thu Feb 28 21:49:31 2013 @@ -29,9 +29,9 @@ import org.apache.accumulo.core.client.C import org.apache.accumulo.core.client.Instance; import org.apache.accumulo.core.client.MultiTableBatchWriter; import org.apache.accumulo.core.client.ZooKeeperInstance; -import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.security.CredentialHelper; import org.apache.accumulo.core.security.thrift.TCredentials; +import org.apache.accumulo.core.security.tokens.PasswordToken; import org.apache.log4j.Logger; public class State { Modified: accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CreateUser.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CreateUser.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CreateUser.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CreateUser.java Thu Feb 28 21:49:31 2013 @@ -22,7 +22,7 @@ import java.util.Random; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.Connector; -import org.apache.accumulo.core.client.security.tokens.PasswordToken; +import org.apache.accumulo.core.security.tokens.PasswordToken; import org.apache.accumulo.test.randomwalk.State; import org.apache.accumulo.test.randomwalk.Test; Modified: accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java Thu Feb 28 21:49:31 2013 @@ -21,10 +21,10 @@ import java.io.IOException; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat; import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat; -import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; +import org.apache.accumulo.core.security.tokens.PasswordToken; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapreduce.Job; Modified: accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/AlterTable.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/AlterTable.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/AlterTable.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/AlterTable.java Thu Feb 28 21:49:31 2013 @@ -24,7 +24,7 @@ import org.apache.accumulo.core.client.A import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.TableExistsException; import org.apache.accumulo.core.client.TableNotFoundException; -import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode; +import org.apache.accumulo.core.security.thrift.SecurityErrorCode; import org.apache.accumulo.test.randomwalk.State; import org.apache.accumulo.test.randomwalk.Test; Modified: accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Authenticate.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Authenticate.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Authenticate.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Authenticate.java Thu Feb 28 21:49:31 2013 @@ -22,8 +22,8 @@ import java.util.Properties; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.Connector; -import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.security.thrift.TCredentials; +import org.apache.accumulo.core.security.tokens.PasswordToken; import org.apache.accumulo.test.randomwalk.State; import org.apache.accumulo.test.randomwalk.Test; Modified: accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/ChangePass.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/ChangePass.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/ChangePass.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/ChangePass.java Thu Feb 28 21:49:31 2013 @@ -22,8 +22,8 @@ import java.util.Random; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.Connector; -import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.security.thrift.TCredentials; +import org.apache.accumulo.core.security.tokens.PasswordToken; import org.apache.accumulo.test.randomwalk.State; import org.apache.accumulo.test.randomwalk.Test; Modified: accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/CreateTable.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/CreateTable.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/CreateTable.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/CreateTable.java Thu Feb 28 21:49:31 2013 @@ -22,8 +22,8 @@ import org.apache.accumulo.core.client.A import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.TableExistsException; -import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode; import org.apache.accumulo.core.security.TablePermission; +import org.apache.accumulo.core.security.thrift.SecurityErrorCode; import org.apache.accumulo.test.randomwalk.State; import org.apache.accumulo.test.randomwalk.Test; Modified: accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/CreateUser.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/CreateUser.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/CreateUser.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/CreateUser.java Thu Feb 28 21:49:31 2013 @@ -21,7 +21,7 @@ import java.util.Properties; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.Connector; -import org.apache.accumulo.core.client.security.tokens.PasswordToken; +import org.apache.accumulo.core.security.tokens.PasswordToken; import org.apache.accumulo.test.randomwalk.State; import org.apache.accumulo.test.randomwalk.Test; Modified: accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/DropTable.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/DropTable.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/DropTable.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/DropTable.java Thu Feb 28 21:49:31 2013 @@ -23,8 +23,8 @@ import org.apache.accumulo.core.client.A import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.TableExistsException; import org.apache.accumulo.core.client.TableNotFoundException; -import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode; import org.apache.accumulo.core.security.thrift.TCredentials; +import org.apache.accumulo.core.security.thrift.SecurityErrorCode; import org.apache.accumulo.test.randomwalk.State; import org.apache.accumulo.test.randomwalk.Test; Modified: accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityFixture.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityFixture.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityFixture.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityFixture.java Thu Feb 28 21:49:31 2013 @@ -20,11 +20,11 @@ import java.net.InetAddress; import java.util.Set; import org.apache.accumulo.core.client.Connector; -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.tokens.PasswordToken; import org.apache.accumulo.test.randomwalk.Fixture; import org.apache.accumulo.test.randomwalk.State; Modified: accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/TableOp.java Thu Feb 28 21:49:31 2013 @@ -32,7 +32,6 @@ import org.apache.accumulo.core.client.C import org.apache.accumulo.core.client.MutationsRejectedException; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.client.TableNotFoundException; -import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Mutation; @@ -43,6 +42,7 @@ import org.apache.accumulo.core.file.rfi import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.ColumnVisibility; import org.apache.accumulo.core.security.TablePermission; +import org.apache.accumulo.core.security.thrift.SecurityErrorCode; import org.apache.accumulo.test.randomwalk.State; import org.apache.accumulo.test.randomwalk.Test; import org.apache.hadoop.fs.FileSystem; Modified: accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Validate.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Validate.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Validate.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Validate.java Thu Feb 28 21:49:31 2013 @@ -21,11 +21,11 @@ import java.util.Properties; import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.Connector; -import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode; -import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException; 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.thrift.SecurityErrorCode; +import org.apache.accumulo.core.security.thrift.ThriftSecurityException; import org.apache.accumulo.test.randomwalk.State; import org.apache.accumulo.test.randomwalk.Test; import org.apache.log4j.Logger; Modified: accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java Thu Feb 28 21:49:31 2013 @@ -25,15 +25,15 @@ import java.util.TreeSet; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.TableNotFoundException; -import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode; -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.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.CachedConfiguration; import org.apache.accumulo.server.security.SecurityOperation; import org.apache.accumulo.server.security.handler.Authenticator; Modified: accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/MapRedVerifyTool.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/MapRedVerifyTool.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/MapRedVerifyTool.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/MapRedVerifyTool.java Thu Feb 28 21:49:31 2013 @@ -21,10 +21,10 @@ import java.util.Iterator; import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat; import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat; -import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; +import org.apache.accumulo.core.security.tokens.PasswordToken; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.io.IntWritable; import org.apache.hadoop.io.NullWritable; Modified: accumulo/branches/ACCUMULO-259-polishing/test/src/test/java/org/apache/accumulo/test/MiniAccumuloClusterTest.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/test/src/test/java/org/apache/accumulo/test/MiniAccumuloClusterTest.java?rev=1451373&r1=1451372&r2=1451373&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259-polishing/test/src/test/java/org/apache/accumulo/test/MiniAccumuloClusterTest.java (original) +++ accumulo/branches/ACCUMULO-259-polishing/test/src/test/java/org/apache/accumulo/test/MiniAccumuloClusterTest.java Thu Feb 28 21:49:31 2013 @@ -27,7 +27,6 @@ import org.apache.accumulo.core.client.C import org.apache.accumulo.core.client.IteratorSetting; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.client.ZooKeeperInstance; -import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Mutation; @@ -37,6 +36,7 @@ import org.apache.accumulo.core.iterator import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.ColumnVisibility; import org.apache.accumulo.core.security.TablePermission; +import org.apache.accumulo.core.security.tokens.PasswordToken; import org.apache.commons.io.FileUtils; import org.apache.log4j.Level; import org.apache.log4j.Logger;