You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/02/25 20:59:22 UTC
svn commit: r1449864 - in /accumulo/branches/1.5:
core/src/main/java/org/apache/accumulo/core/client/impl/
test/src/main/java/org/apache/accumulo/test/
test/src/main/java/org/apache/accumulo/test/randomwalk/security/
Author: ecn
Date: Mon Feb 25 19:59:21 2013
New Revision: 1449864
URL: http://svn.apache.org/r1449864
Log:
ACCUMULO-1105 found many bad refactorings of the authentication stuff
Modified:
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java
accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/AlterTablePerm.java
accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Authenticate.java
accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/ChangePass.java
accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/DropTable.java
Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java?rev=1449864&r1=1449863&r2=1449864&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java (original)
+++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java Mon Feb 25 19:59:21 2013
@@ -135,7 +135,7 @@ class OfflineIterator implements Iterato
this.readers = new ArrayList<SortedKeyValueIterator<Key,Value>>();
try {
- conn = instance.getConnector(credentials.getPrincipal(), credentials.getToken());
+ conn = instance.getConnector(credentials);
nextTablet();
while (iter != null && !iter.hasTop())
Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java?rev=1449864&r1=1449863&r2=1449864&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java (original)
+++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java Mon Feb 25 19:59:21 2013
@@ -58,7 +58,7 @@ public class QueryMetadataTable {
try {
KeyExtent extent = new KeyExtent(row, (Text) null);
- Connector connector = HdfsZooInstance.getInstance().getConnector(credentials.getPrincipal(), credentials.getToken());
+ Connector connector = HdfsZooInstance.getInstance().getConnector(credentials);
Scanner mdScanner = connector.createScanner(Constants.METADATA_TABLE_NAME, Constants.NO_AUTHS);
Text row = extent.getMetadataEntry();
Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/AlterTablePerm.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/AlterTablePerm.java?rev=1449864&r1=1449863&r2=1449864&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/AlterTablePerm.java (original)
+++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/AlterTablePerm.java Mon Feb 25 19:59:21 2013
@@ -69,7 +69,7 @@ public class AlterTablePerm extends Test
} else {
source = state.getCredentials();
}
- Connector conn = state.getInstance().getConnector(source.getPrincipal(), source.getToken());
+ Connector conn = state.getInstance().getConnector(source);
canGive = WalkingSecurity.get(state).canGrantTable(source, target, WalkingSecurity.get(state).getTableName());
Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Authenticate.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Authenticate.java?rev=1449864&r1=1449863&r2=1449864&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Authenticate.java (original)
+++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Authenticate.java Mon Feb 25 19:59:21 2013
@@ -37,7 +37,7 @@ public class Authenticate extends Test {
String targetProp = props.getProperty("target");
boolean success = Boolean.parseBoolean(props.getProperty("valid"));
- Connector conn = state.getInstance().getConnector(auth.getPrincipal(), auth.getToken());
+ Connector conn = state.getInstance().getConnector(auth);
String target;
Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/ChangePass.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/ChangePass.java?rev=1449864&r1=1449863&r2=1449864&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/ChangePass.java (original)
+++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/ChangePass.java Mon Feb 25 19:59:21 2013
@@ -41,7 +41,7 @@ public class ChangePass extends Test {
} else {
auth = WalkingSecurity.get(state).getTabCredentials();
}
- Connector conn = state.getInstance().getConnector(auth.getPrincipal(), auth.getToken());
+ Connector conn = state.getInstance().getConnector(auth);
boolean hasPerm;
boolean targetExists;
Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/DropTable.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/DropTable.java?rev=1449864&r1=1449863&r2=1449864&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/DropTable.java (original)
+++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/DropTable.java Mon Feb 25 19:59:21 2013
@@ -43,7 +43,7 @@ public class DropTable extends Test {
} else {
auth = WalkingSecurity.get(state).getSysCredentials();
}
- Connector conn = state.getInstance().getConnector(auth.getPrincipal(), auth.getToken());
+ Connector conn = state.getInstance().getConnector(auth);
String tableName = WalkingSecurity.get(state).getTableName();