Updated Branches: refs/heads/1.6.0-SNAPSHOT 45fbee693 -> 515cd9dfd
ACCUMULO-1833 Fix merge to 1.6.0 regarding TCredentials->Credentials Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/515cd9df Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/515cd9df Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/515cd9df Branch: refs/heads/1.6.0-SNAPSHOT Commit: 515cd9dfd97845df2c3720548c2a5c53440c0654 Parents: 45fbee6 Author: Josh Elser <els...@apache.org> Authored: Mon Nov 18 15:04:33 2013 -0500 Committer: Josh Elser <els...@apache.org> Committed: Mon Nov 18 15:04:33 2013 -0500 ---------------------------------------------------------------------- .../accumulo/test/MultiTableBatchWriterTest.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/515cd9df/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterTest.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterTest.java b/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterTest.java index c5290e4..8c6bcc6 100644 --- a/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterTest.java +++ b/test/src/test/java/org/apache/accumulo/test/MultiTableBatchWriterTest.java @@ -39,7 +39,7 @@ 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.Authorizations; -import org.apache.accumulo.core.security.CredentialHelper; +import org.apache.accumulo.core.security.Credentials; import org.apache.accumulo.core.security.thrift.TCredentials; import org.apache.accumulo.minicluster.MiniAccumuloCluster; import org.apache.accumulo.minicluster.MiniAccumuloConfig; @@ -48,6 +48,7 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.mortbay.jetty.security.Credential; import com.google.common.collect.Maps; @@ -77,7 +78,7 @@ public class MultiTableBatchWriterTest { BatchWriterConfig config = new BatchWriterConfig(); - TCredentials creds = CredentialHelper.create("root", password, instance.getInstanceID()); + Credentials creds = new Credentials("root", password); MultiTableBatchWriter mtbw = new MultiTableBatchWriterImpl(instance, creds, config, 60, TimeUnit.SECONDS); try { @@ -145,7 +146,7 @@ public class MultiTableBatchWriterTest { BatchWriterConfig config = new BatchWriterConfig(); - TCredentials creds = CredentialHelper.create("root", password, instance.getInstanceID()); + Credentials creds = new Credentials("root", password); MultiTableBatchWriter mtbw = new MultiTableBatchWriterImpl(instance, creds, config, 60, TimeUnit.SECONDS); try { @@ -207,7 +208,7 @@ public class MultiTableBatchWriterTest { BatchWriterConfig config = new BatchWriterConfig(); - TCredentials creds = CredentialHelper.create("root", password, instance.getInstanceID()); + Credentials creds = new Credentials("root", password); MultiTableBatchWriter mtbw = new MultiTableBatchWriterImpl(instance, creds, config, 60, TimeUnit.SECONDS); try { @@ -289,7 +290,7 @@ public class MultiTableBatchWriterTest { BatchWriterConfig config = new BatchWriterConfig(); - TCredentials creds = CredentialHelper.create("root", password, instance.getInstanceID()); + Credentials creds = new Credentials("root", password); MultiTableBatchWriter mtbw = new MultiTableBatchWriterImpl(instance, creds, config, 0, TimeUnit.SECONDS); try { @@ -338,7 +339,7 @@ public class MultiTableBatchWriterTest { BatchWriterConfig config = new BatchWriterConfig(); - TCredentials creds = CredentialHelper.create("root", password, instance.getInstanceID()); + Credentials creds = new Credentials("root", password); MultiTableBatchWriter mtbw = new MultiTableBatchWriterImpl(instance, creds, config, 60, TimeUnit.SECONDS); try { @@ -387,7 +388,7 @@ public class MultiTableBatchWriterTest { BatchWriterConfig config = new BatchWriterConfig(); - TCredentials creds = CredentialHelper.create("root", password, instance.getInstanceID()); + Credentials creds = new Credentials("root", password); MultiTableBatchWriter mtbw = new MultiTableBatchWriterImpl(instance, creds, config, 60, TimeUnit.SECONDS); try { @@ -436,7 +437,7 @@ public class MultiTableBatchWriterTest { BatchWriterConfig config = new BatchWriterConfig(); - TCredentials creds = CredentialHelper.create("root", password, instance.getInstanceID()); + Credentials creds = new Credentials("root", password); MultiTableBatchWriter mtbw = new MultiTableBatchWriterImpl(instance, creds, config, 60, TimeUnit.SECONDS); try { @@ -490,7 +491,7 @@ public class MultiTableBatchWriterTest { BatchWriterConfig config = new BatchWriterConfig(); - TCredentials creds = CredentialHelper.create("root", password, instance.getInstanceID()); + Credentials creds = new Credentials("root", password); MultiTableBatchWriter mtbw = new MultiTableBatchWriterImpl(instance, creds, config, 0, TimeUnit.SECONDS); try {
