You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by vi...@apache.org on 2013/02/28 22:49:34 UTC
svn commit: r1451373 [3/7] - in /accumulo/branches/ACCUMULO-259-polishing:
core/src/main/java/org/apache/accumulo/core/cli/
core/src/main/java/org/apache/accumulo/core/client/
core/src/main/java/org/apache/accumulo/core/client/admin/
core/src/main/java...
Modified: accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java?rev=1451373&r1=1451372&r2=1451373&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java (original)
+++ accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java Thu Feb 28 21:49:31 2013
@@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
public boolean fails() throws org.apache.thrift.TException;
- public boolean throwsError() throws ThriftSecurityException, org.apache.thrift.TException;
+ public boolean throwsError() throws org.apache.accumulo.core.security.thrift.ThriftSecurityException, org.apache.thrift.TException;
}
@@ -132,7 +132,7 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "fails failed: unknown result");
}
- public boolean throwsError() throws ThriftSecurityException, org.apache.thrift.TException
+ public boolean throwsError() throws org.apache.accumulo.core.security.thrift.ThriftSecurityException, org.apache.thrift.TException
{
send_throwsError();
return recv_throwsError();
@@ -144,7 +144,7 @@ import org.slf4j.LoggerFactory;
sendBase("throwsError", args);
}
- public boolean recv_throwsError() throws ThriftSecurityException, org.apache.thrift.TException
+ public boolean recv_throwsError() throws org.apache.accumulo.core.security.thrift.ThriftSecurityException, org.apache.thrift.TException
{
throwsError_result result = new throwsError_result();
receiveBase(result, "throwsError");
@@ -252,7 +252,7 @@ import org.slf4j.LoggerFactory;
prot.writeMessageEnd();
}
- public boolean getResult() throws ThriftSecurityException, org.apache.thrift.TException {
+ public boolean getResult() throws org.apache.accumulo.core.security.thrift.ThriftSecurityException, org.apache.thrift.TException {
if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
throw new IllegalStateException("Method call not finished!");
}
@@ -341,7 +341,7 @@ import org.slf4j.LoggerFactory;
try {
result.success = iface.throwsError();
result.setSuccessIsSet(true);
- } catch (ThriftSecurityException ex) {
+ } catch (org.apache.accumulo.core.security.thrift.ThriftSecurityException ex) {
result.ex = ex;
}
return result;
@@ -1809,7 +1809,7 @@ import org.slf4j.LoggerFactory;
}
public boolean success; // required
- public ThriftSecurityException ex; // required
+ public org.apache.accumulo.core.security.thrift.ThriftSecurityException ex; // 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 {
@@ -1891,7 +1891,7 @@ import org.slf4j.LoggerFactory;
public throwsError_result(
boolean success,
- ThriftSecurityException ex)
+ org.apache.accumulo.core.security.thrift.ThriftSecurityException ex)
{
this();
this.success = success;
@@ -1906,7 +1906,7 @@ import org.slf4j.LoggerFactory;
__isset_bitfield = other.__isset_bitfield;
this.success = other.success;
if (other.isSetEx()) {
- this.ex = new ThriftSecurityException(other.ex);
+ this.ex = new org.apache.accumulo.core.security.thrift.ThriftSecurityException(other.ex);
}
}
@@ -1944,11 +1944,11 @@ import org.slf4j.LoggerFactory;
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
}
- public ThriftSecurityException getEx() {
+ public org.apache.accumulo.core.security.thrift.ThriftSecurityException getEx() {
return this.ex;
}
- public throwsError_result setEx(ThriftSecurityException ex) {
+ public throwsError_result setEx(org.apache.accumulo.core.security.thrift.ThriftSecurityException ex) {
this.ex = ex;
return this;
}
@@ -1982,7 +1982,7 @@ import org.slf4j.LoggerFactory;
if (value == null) {
unsetEx();
} else {
- setEx((ThriftSecurityException)value);
+ setEx((org.apache.accumulo.core.security.thrift.ThriftSecurityException)value);
}
break;
@@ -2169,7 +2169,7 @@ import org.slf4j.LoggerFactory;
break;
case 1: // EX
if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
- struct.ex = new ThriftSecurityException();
+ struct.ex = new org.apache.accumulo.core.security.thrift.ThriftSecurityException();
struct.ex.read(iprot);
struct.setExIsSet(true);
} else {
@@ -2243,7 +2243,7 @@ import org.slf4j.LoggerFactory;
struct.setSuccessIsSet(true);
}
if (incoming.get(1)) {
- struct.ex = new ThriftSecurityException();
+ struct.ex = new org.apache.accumulo.core.security.thrift.ThriftSecurityException();
struct.ex.read(iprot);
struct.setExIsSet(true);
}
Modified: accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java?rev=1451373&r1=1451372&r2=1451373&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java (original)
+++ accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java Thu Feb 28 21:49:31 2013
@@ -19,10 +19,10 @@ package org.apache.accumulo.core.client.
import java.io.IOException;
import java.util.Map.Entry;
-import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.util.format.DefaultFormatter;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.mapred.InputFormat;
Modified: accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java?rev=1451373&r1=1451372&r2=1451373&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java (original)
+++ accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java Thu Feb 28 21:49:31 2013
@@ -33,15 +33,15 @@ import org.apache.accumulo.core.client.M
import org.apache.accumulo.core.client.TableExistsException;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.client.ZooKeeperInstance;
-import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode;
import org.apache.accumulo.core.client.mapreduce.lib.util.OutputConfigurator;
import org.apache.accumulo.core.client.mock.MockInstance;
-import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.data.ColumnUpdate;
import org.apache.accumulo.core.data.KeyExtent;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.security.ColumnVisibility;
import org.apache.accumulo.core.security.CredentialHelper;
+import org.apache.accumulo.core.security.thrift.SecurityErrorCode;
+import org.apache.accumulo.core.security.tokens.AuthenticationToken;
import org.apache.hadoop.filecache.DistributedCache;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
Modified: accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java?rev=1451373&r1=1451372&r2=1451373&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java (original)
+++ accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java Thu Feb 28 21:49:31 2013
@@ -20,10 +20,10 @@ import java.io.IOException;
import java.util.Map.Entry;
import org.apache.accumulo.core.client.RowIterator;
-import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.util.PeekingIterator;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
Modified: accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java?rev=1451373&r1=1451372&r2=1451373&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java (original)
+++ accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java Thu Feb 28 21:49:31 2013
@@ -47,7 +47,6 @@ import org.apache.accumulo.core.client.i
import org.apache.accumulo.core.client.impl.TabletLocator;
import org.apache.accumulo.core.client.mapreduce.lib.util.InputConfigurator;
import org.apache.accumulo.core.client.mock.MockInstance;
-import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.KeyExtent;
import org.apache.accumulo.core.data.PartialKey;
@@ -57,6 +56,7 @@ import org.apache.accumulo.core.master.s
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.tokens.AuthenticationToken;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.hadoop.filecache.DistributedCache;
Modified: accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java?rev=1451373&r1=1451372&r2=1451373&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java (original)
+++ accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java Thu Feb 28 21:49:31 2013
@@ -19,10 +19,10 @@ package org.apache.accumulo.core.client.
import java.io.IOException;
import java.util.Map.Entry;
-import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.util.format.DefaultFormatter;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.mapreduce.InputFormat;
Modified: accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java?rev=1451373&r1=1451372&r2=1451373&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java (original)
+++ accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java Thu Feb 28 21:49:31 2013
@@ -34,16 +34,16 @@ import org.apache.accumulo.core.client.M
import org.apache.accumulo.core.client.TableExistsException;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.client.ZooKeeperInstance;
-import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode;
import org.apache.accumulo.core.client.mapreduce.lib.util.OutputConfigurator;
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.data.ColumnUpdate;
import org.apache.accumulo.core.data.KeyExtent;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.security.ColumnVisibility;
import org.apache.accumulo.core.security.CredentialHelper;
+import org.apache.accumulo.core.security.thrift.SecurityErrorCode;
+import org.apache.accumulo.core.security.tokens.AuthenticationToken;
+import org.apache.accumulo.core.security.tokens.PasswordToken;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.filecache.DistributedCache;
import org.apache.hadoop.fs.Path;
Modified: accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java?rev=1451373&r1=1451372&r2=1451373&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java (original)
+++ accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java Thu Feb 28 21:49:31 2013
@@ -20,10 +20,10 @@ import java.io.IOException;
import java.util.Map.Entry;
import org.apache.accumulo.core.client.RowIterator;
-import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.util.PeekingIterator;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
Modified: accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java?rev=1451373&r1=1451372&r2=1451373&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java (original)
+++ accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java Thu Feb 28 21:49:31 2013
@@ -54,8 +54,6 @@ import org.apache.accumulo.core.client.i
import org.apache.accumulo.core.client.impl.TabletLocator;
import org.apache.accumulo.core.client.mapreduce.lib.util.InputConfigurator;
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.data.ByteSequence;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.KeyExtent;
@@ -67,6 +65,8 @@ import org.apache.accumulo.core.master.s
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.tokens.AuthenticationToken;
+import org.apache.accumulo.core.security.tokens.PasswordToken;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.hadoop.conf.Configuration;
Modified: accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java?rev=1451373&r1=1451372&r2=1451373&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java (original)
+++ accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.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.Instance;
import org.apache.accumulo.core.client.ZooKeeperInstance;
import org.apache.accumulo.core.client.mock.MockInstance;
-import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.security.CredentialHelper;
+import org.apache.accumulo.core.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.util.ArgumentChecker;
import org.apache.commons.codec.binary.Base64;
import org.apache.hadoop.conf.Configuration;
Modified: accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java?rev=1451373&r1=1451372&r2=1451373&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java (original)
+++ accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java Thu Feb 28 21:49:31 2013
@@ -25,11 +25,11 @@ import java.util.SortedSet;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.BatchScanner;
import org.apache.accumulo.core.client.admin.TimeType;
-import org.apache.accumulo.core.client.security.tokens.PasswordToken;
import org.apache.accumulo.core.data.Mutation;
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.PasswordToken;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.io.Text;
Modified: accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java?rev=1451373&r1=1451372&r2=1451373&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java (original)
+++ accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstance.java Thu Feb 28 21:49:31 2013
@@ -27,14 +27,14 @@ 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.Instance;
-import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode;
-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.security.CredentialHelper;
import org.apache.accumulo.core.security.handler.ZKAuthenticator;
import org.apache.accumulo.core.security.thrift.AuthInfo;
+import org.apache.accumulo.core.security.thrift.SecurityErrorCode;
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.core.util.ByteBufferUtil;
import org.apache.accumulo.core.util.CachedConfiguration;
import org.apache.accumulo.core.util.TextUtil;
Modified: accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mock/MockSecurityOperations.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mock/MockSecurityOperations.java?rev=1451373&r1=1451372&r2=1451373&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mock/MockSecurityOperations.java (original)
+++ accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mock/MockSecurityOperations.java Thu Feb 28 21:49:31 2013
@@ -22,12 +22,12 @@ import java.util.Set;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.admin.SecurityOperations;
-import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode;
-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.thrift.SecurityErrorCode;
+import org.apache.accumulo.core.security.tokens.AuthenticationToken;
+import org.apache.accumulo.core.security.tokens.PasswordToken;
public class MockSecurityOperations implements SecurityOperations {
Modified: accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mock/MockUser.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mock/MockUser.java?rev=1451373&r1=1451372&r2=1451373&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mock/MockUser.java (original)
+++ accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/client/mock/MockUser.java Thu Feb 28 21:49:31 2013
@@ -18,9 +18,9 @@ package org.apache.accumulo.core.client.
import java.util.EnumSet;
-import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.SystemPermission;
+import org.apache.accumulo.core.security.tokens.AuthenticationToken;
public class MockUser {
final EnumSet<SystemPermission> permissions;
Modified: accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java?rev=1451373&r1=1451372&r2=1451373&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java (original)
+++ accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java Thu Feb 28 21:49:31 2013
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
public Map<TKeyExtent,Long> failedExtents; // required
public List<TConstraintViolationSummary> violationSummaries; // required
- public Map<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode> authorizationFailures; // required
+ public Map<TKeyExtent,org.apache.accumulo.core.security.thrift.SecurityErrorCode> authorizationFailures; // 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 {
@@ -141,7 +141,7 @@ import org.slf4j.LoggerFactory;
tmpMap.put(_Fields.AUTHORIZATION_FAILURES, new org.apache.thrift.meta_data.FieldMetaData("authorizationFailures", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TKeyExtent.class),
- new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode.class))));
+ new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.accumulo.core.security.thrift.SecurityErrorCode.class))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(UpdateErrors.class, metaDataMap);
}
@@ -152,7 +152,7 @@ import org.slf4j.LoggerFactory;
public UpdateErrors(
Map<TKeyExtent,Long> failedExtents,
List<TConstraintViolationSummary> violationSummaries,
- Map<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode> authorizationFailures)
+ Map<TKeyExtent,org.apache.accumulo.core.security.thrift.SecurityErrorCode> authorizationFailures)
{
this();
this.failedExtents = failedExtents;
@@ -187,15 +187,15 @@ import org.slf4j.LoggerFactory;
this.violationSummaries = __this__violationSummaries;
}
if (other.isSetAuthorizationFailures()) {
- Map<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode> __this__authorizationFailures = new HashMap<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode>();
- for (Map.Entry<TKeyExtent, org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode> other_element : other.authorizationFailures.entrySet()) {
+ Map<TKeyExtent,org.apache.accumulo.core.security.thrift.SecurityErrorCode> __this__authorizationFailures = new HashMap<TKeyExtent,org.apache.accumulo.core.security.thrift.SecurityErrorCode>();
+ for (Map.Entry<TKeyExtent, org.apache.accumulo.core.security.thrift.SecurityErrorCode> other_element : other.authorizationFailures.entrySet()) {
TKeyExtent other_element_key = other_element.getKey();
- org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode other_element_value = other_element.getValue();
+ org.apache.accumulo.core.security.thrift.SecurityErrorCode other_element_value = other_element.getValue();
TKeyExtent __this__authorizationFailures_copy_key = new TKeyExtent(other_element_key);
- org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode __this__authorizationFailures_copy_value = other_element_value;
+ org.apache.accumulo.core.security.thrift.SecurityErrorCode __this__authorizationFailures_copy_value = other_element_value;
__this__authorizationFailures.put(__this__authorizationFailures_copy_key, __this__authorizationFailures_copy_value);
}
@@ -292,18 +292,18 @@ import org.slf4j.LoggerFactory;
return (this.authorizationFailures == null) ? 0 : this.authorizationFailures.size();
}
- public void putToAuthorizationFailures(TKeyExtent key, org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode val) {
+ public void putToAuthorizationFailures(TKeyExtent key, org.apache.accumulo.core.security.thrift.SecurityErrorCode val) {
if (this.authorizationFailures == null) {
- this.authorizationFailures = new HashMap<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode>();
+ this.authorizationFailures = new HashMap<TKeyExtent,org.apache.accumulo.core.security.thrift.SecurityErrorCode>();
}
this.authorizationFailures.put(key, val);
}
- public Map<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode> getAuthorizationFailures() {
+ public Map<TKeyExtent,org.apache.accumulo.core.security.thrift.SecurityErrorCode> getAuthorizationFailures() {
return this.authorizationFailures;
}
- public UpdateErrors setAuthorizationFailures(Map<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode> authorizationFailures) {
+ public UpdateErrors setAuthorizationFailures(Map<TKeyExtent,org.apache.accumulo.core.security.thrift.SecurityErrorCode> authorizationFailures) {
this.authorizationFailures = authorizationFailures;
return this;
}
@@ -345,7 +345,7 @@ import org.slf4j.LoggerFactory;
if (value == null) {
unsetAuthorizationFailures();
} else {
- setAuthorizationFailures((Map<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode>)value);
+ setAuthorizationFailures((Map<TKeyExtent,org.apache.accumulo.core.security.thrift.SecurityErrorCode>)value);
}
break;
@@ -600,14 +600,14 @@ import org.slf4j.LoggerFactory;
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
org.apache.thrift.protocol.TMap _map57 = iprot.readMapBegin();
- struct.authorizationFailures = new HashMap<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode>(2*_map57.size);
+ struct.authorizationFailures = new HashMap<TKeyExtent,org.apache.accumulo.core.security.thrift.SecurityErrorCode>(2*_map57.size);
for (int _i58 = 0; _i58 < _map57.size; ++_i58)
{
TKeyExtent _key59; // required
- org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode _val60; // required
+ org.apache.accumulo.core.security.thrift.SecurityErrorCode _val60; // required
_key59 = new TKeyExtent();
_key59.read(iprot);
- _val60 = org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode.findByValue(iprot.readI32());
+ _val60 = org.apache.accumulo.core.security.thrift.SecurityErrorCode.findByValue(iprot.readI32());
struct.authorizationFailures.put(_key59, _val60);
}
iprot.readMapEnd();
@@ -661,7 +661,7 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(AUTHORIZATION_FAILURES_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I32, struct.authorizationFailures.size()));
- for (Map.Entry<TKeyExtent, org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode> _iter63 : struct.authorizationFailures.entrySet())
+ for (Map.Entry<TKeyExtent, org.apache.accumulo.core.security.thrift.SecurityErrorCode> _iter63 : struct.authorizationFailures.entrySet())
{
_iter63.getKey().write(oprot);
oprot.writeI32(_iter63.getValue().getValue());
@@ -720,7 +720,7 @@ import org.slf4j.LoggerFactory;
if (struct.isSetAuthorizationFailures()) {
{
oprot.writeI32(struct.authorizationFailures.size());
- for (Map.Entry<TKeyExtent, org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode> _iter66 : struct.authorizationFailures.entrySet())
+ for (Map.Entry<TKeyExtent, org.apache.accumulo.core.security.thrift.SecurityErrorCode> _iter66 : struct.authorizationFailures.entrySet())
{
_iter66.getKey().write(oprot);
oprot.writeI32(_iter66.getValue().getValue());
@@ -766,14 +766,14 @@ import org.slf4j.LoggerFactory;
if (incoming.get(2)) {
{
org.apache.thrift.protocol.TMap _map74 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I32, iprot.readI32());
- struct.authorizationFailures = new HashMap<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode>(2*_map74.size);
+ struct.authorizationFailures = new HashMap<TKeyExtent,org.apache.accumulo.core.security.thrift.SecurityErrorCode>(2*_map74.size);
for (int _i75 = 0; _i75 < _map74.size; ++_i75)
{
TKeyExtent _key76; // required
- org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode _val77; // required
+ org.apache.accumulo.core.security.thrift.SecurityErrorCode _val77; // required
_key76 = new TKeyExtent();
_key76.read(iprot);
- _val77 = org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode.findByValue(iprot.readI32());
+ _val77 = org.apache.accumulo.core.security.thrift.SecurityErrorCode.findByValue(iprot.readI32());
struct.authorizationFailures.put(_key76, _val77);
}
}
Modified: accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java?rev=1451373&r1=1451372&r2=1451373&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java (original)
+++ accumulo/branches/ACCUMULO-259-polishing/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java Thu Feb 28 21:49:31 2013
@@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
public interface Iface {
- public GCStatus getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException;
+ public GCStatus getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.accumulo.core.security.thrift.ThriftSecurityException, org.apache.thrift.TException;
}
@@ -80,7 +80,7 @@ import org.slf4j.LoggerFactory;
super(iprot, oprot);
}
- public GCStatus getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException
+ public GCStatus getStatus(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.accumulo.core.security.thrift.ThriftSecurityException, org.apache.thrift.TException
{
send_getStatus(tinfo, credentials);
return recv_getStatus();
@@ -94,7 +94,7 @@ import org.slf4j.LoggerFactory;
sendBase("getStatus", args);
}
- public GCStatus recv_getStatus() throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException
+ public GCStatus recv_getStatus() throws org.apache.accumulo.core.security.thrift.ThriftSecurityException, org.apache.thrift.TException
{
getStatus_result result = new getStatus_result();
receiveBase(result, "getStatus");
@@ -150,7 +150,7 @@ import org.slf4j.LoggerFactory;
prot.writeMessageEnd();
}
- public GCStatus getResult() throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException {
+ public GCStatus getResult() throws org.apache.accumulo.core.security.thrift.ThriftSecurityException, org.apache.thrift.TException {
if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
throw new IllegalStateException("Method call not finished!");
}
@@ -194,7 +194,7 @@ import org.slf4j.LoggerFactory;
getStatus_result result = new getStatus_result();
try {
result.success = iface.getStatus(args.tinfo, args.credentials);
- } catch (org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException sec) {
+ } catch (org.apache.accumulo.core.security.thrift.ThriftSecurityException sec) {
result.sec = sec;
}
return result;
@@ -680,7 +680,7 @@ import org.slf4j.LoggerFactory;
}
public GCStatus success; // required
- public org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException sec; // required
+ public org.apache.accumulo.core.security.thrift.ThriftSecurityException sec; // 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 {
@@ -760,7 +760,7 @@ import org.slf4j.LoggerFactory;
public getStatus_result(
GCStatus success,
- org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException sec)
+ org.apache.accumulo.core.security.thrift.ThriftSecurityException sec)
{
this();
this.success = success;
@@ -775,7 +775,7 @@ import org.slf4j.LoggerFactory;
this.success = new GCStatus(other.success);
}
if (other.isSetSec()) {
- this.sec = new org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException(other.sec);
+ this.sec = new org.apache.accumulo.core.security.thrift.ThriftSecurityException(other.sec);
}
}
@@ -813,11 +813,11 @@ import org.slf4j.LoggerFactory;
}
}
- public org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException getSec() {
+ public org.apache.accumulo.core.security.thrift.ThriftSecurityException getSec() {
return this.sec;
}
- public getStatus_result setSec(org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException sec) {
+ public getStatus_result setSec(org.apache.accumulo.core.security.thrift.ThriftSecurityException sec) {
this.sec = sec;
return this;
}
@@ -851,7 +851,7 @@ import org.slf4j.LoggerFactory;
if (value == null) {
unsetSec();
} else {
- setSec((org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException)value);
+ setSec((org.apache.accumulo.core.security.thrift.ThriftSecurityException)value);
}
break;
@@ -1044,7 +1044,7 @@ import org.slf4j.LoggerFactory;
break;
case 1: // SEC
if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
- struct.sec = new org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException();
+ struct.sec = new org.apache.accumulo.core.security.thrift.ThriftSecurityException();
struct.sec.read(iprot);
struct.setSecIsSet(true);
} else {
@@ -1119,7 +1119,7 @@ import org.slf4j.LoggerFactory;
struct.setSuccessIsSet(true);
}
if (incoming.get(1)) {
- struct.sec = new org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException();
+ struct.sec = new org.apache.accumulo.core.security.thrift.ThriftSecurityException();
struct.sec.read(iprot);
struct.setSecIsSet(true);
}