Author: vines
Date: Tue Feb 5 00:11:55 2013
New Revision: 1442440
URL: http://svn.apache.org/viewvc?rev=1442440&view=rev
Log:
ACCUMULO-259 ACCUMULO-971 - more missed merges. Remaining javadoc
inconsistencies will be addressed after ACCUMULO-1041
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperations.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperations.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperations.java?rev=1442440&r1=1442439&r2=1442440&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperations.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperations.java
Tue Feb 5 00:11:55 2013
@@ -42,7 +42,7 @@ public interface SecurityOperations {
* if a general error occurs
* @throws AccumuloSecurityException
* if the user does not have permission to create a user
- * @deprecated Use {@link #createUser(SecurityToken)} instead
+ * @deprecated Use {@link #createUser(String, byte[])} instead
*/
@Deprecated
public void createUser(String user, byte[] password, Authorizations
authorizations) throws AccumuloException, AccumuloSecurityException;
@@ -50,6 +50,8 @@ public interface SecurityOperations {
/**
* Create a user
*
+ * @param principal
+ * the principal being created
* @param token
* the security token with the information about the user to create
* @throws AccumuloException
@@ -57,7 +59,7 @@ public interface SecurityOperations {
* @throws AccumuloSecurityException
* if the user does not have permission to create a user
*/
- public void createUser(String user, byte[] password) throws
AccumuloException, AccumuloSecurityException;
+ public void createUser(String principal, byte[] token) throws
AccumuloException, AccumuloSecurityException;
/**
* Delete a user
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java?rev=1442440&r1=1442439&r2=1442440&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/SecurityOperationsImpl.java
Tue Feb 5 00:11:55 2013
@@ -122,15 +122,17 @@ public class SecurityOperationsImpl impl
/**
* Create a user
*
- * @param newToken
+ * @param principal
+ * the principal to create
+ * @param token
* the security token with the information about the user to create
* @throws AccumuloException
* if a general error occurs
* @throws AccumuloSecurityException
* if the user does not have permission to create a user
*/
- public void createUser(final String user, final byte[] password) throws
AccumuloException, AccumuloSecurityException {
- createUser(user, password, new Authorizations());
+ public void createUser(final String principal, final byte[] token) throws
AccumuloException, AccumuloSecurityException {
+ createUser(principal, token, new Authorizations());
}
/**
@@ -157,9 +159,9 @@ public class SecurityOperationsImpl impl
/**
* Verify a username/password combination is valid
*
- * @param user
+ * @param principal
* the name of the user to authenticate
- * @param password
+ * @param token
* the plaintext password for the user
* @return true if the user asking is allowed to know and the specified
user/password is valid, false otherwise
* @throws AccumuloException
@@ -169,12 +171,12 @@ public class SecurityOperationsImpl impl
*/
@Deprecated
@Override
- public boolean authenticateUser(final String user, final byte[] password)
throws AccumuloException, AccumuloSecurityException {
- ArgumentChecker.notNull(user, password);
+ public boolean authenticateUser(final String principal, final byte[] token)
throws AccumuloException, AccumuloSecurityException {
+ ArgumentChecker.notNull(principal, token);
return execute(new ClientExecReturn<Boolean,ClientService.Client>() {
@Override
public Boolean execute(ClientService.Client client) throws Exception {
- return client.authenticateUser(Tracer.traceInfo(), credentials, user,
ByteBuffer.wrap(password));
+ return client.authenticateUser(Tracer.traceInfo(), credentials,
principal, ByteBuffer.wrap(token));
}
});
}
@@ -182,7 +184,9 @@ public class SecurityOperationsImpl impl
/**
* Set the user's password
*
- * @param newToken
+ * @param principal
+ * the principal who's password is to be changed
+ * @param token
* the security token with the information about the user to modify
* @throws AccumuloException
* if a general error occurs
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java?rev=1442440&r1=1442439&r2=1442440&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloInputFormat.java
Tue Feb 5 00:11:55 2013
@@ -37,7 +37,7 @@ import org.apache.hadoop.mapred.Reporter
* The user must specify the following via static configurator methods:
*
* <ul>
- * <li>{@link AccumuloInputFormat#setConnectorInfo(JobConf, AccumuloToken)} OR
{@link AccumuloInputFormat#setConnectorInfo(JobConf, Path)}
+ * <li>{@link AccumuloInputFormat#setConnectorInfo(JobConf, String, byte[])}
OR {@link AccumuloInputFormat#setConnectorInfo(JobConf, Path)}
* <li>{@link AccumuloInputFormat#setInputTableName(JobConf, String)}
* <li>{@link AccumuloInputFormat#setScanAuthorizations(JobConf,
Authorizations)}
* <li>{@link AccumuloInputFormat#setZooKeeperInstance(JobConf, String,
String)} OR {@link AccumuloInputFormat#setMockInstance(JobConf, String)}
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java?rev=1442440&r1=1442439&r2=1442440&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
Tue Feb 5 00:11:55 2013
@@ -59,11 +59,7 @@ import org.apache.log4j.Logger;
* The user must specify the following via static configurator methods:
*
* <ul>
-<<<<<<< .working
- * <li>{@link AccumuloOutputFormat#setConnectorInfo(JobConf, AccumuloToken)}
OR {@link AccumuloOutputFormat#setConnectorInfo(JobConf, Path)}
-=======
* <li>{@link AccumuloOutputFormat#setConnectorInfo(JobConf, String, byte[])}
->>>>>>> .merge-right.r1438353
* <li>{@link AccumuloOutputFormat#setZooKeeperInstance(JobConf, String,
String)} OR {@link AccumuloOutputFormat#setMockInstance(JobConf, String)}
* </ul>
*
@@ -83,15 +79,10 @@ public class AccumuloOutputFormat implem
*
* @param job
* the Hadoop job instance to be configured
-<<<<<<< .working
- * @param token
- * a valid AccumuloToken (principal must have Table.CREATE
permission)
-=======
* @param user
* a valid Accumulo user name (user must have Table.CREATE
permission if {@link #setCreateTables(JobConf, boolean)} is set to true)
* @param passwd
* the user's password
->>>>>>> .merge-right.r1438353
* @since 1.5.0
*/
public static void setConnectorInfo(JobConf job, String user, byte[] passwd)
{
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java?rev=1442440&r1=1442439&r2=1442440&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloRowInputFormat.java
Tue Feb 5 00:11:55 2013
@@ -39,7 +39,7 @@ import org.apache.hadoop.mapred.Reporter
* The user must specify the following via static configurator methods:
*
* <ul>
- * <li>{@link AccumuloRowInputFormat#setConnectorInfo(JobConf, AccumuloToken)}
OR {@link AccumuloRowInputFormat#setConnectorInfo(JobConf, Path)}
+ * <li>{@link AccumuloRowInputFormat#setConnectorInfo(JobConf, String,
byte[])} OR {@link AccumuloRowInputFormat#setConnectorInfo(JobConf, Path)}
* <li>{@link AccumuloRowInputFormat#setInputTableName(JobConf, String)}
* <li>{@link AccumuloRowInputFormat#setScanAuthorizations(JobConf,
Authorizations)}
* <li>{@link AccumuloRowInputFormat#setZooKeeperInstance(JobConf, String,
String)} OR {@link AccumuloRowInputFormat#setMockInstance(JobConf, String)}
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java?rev=1442440&r1=1442439&r2=1442440&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
Tue Feb 5 00:11:55 2013
@@ -92,19 +92,14 @@ public abstract class InputFormatBase<K,
*
* @param job
* the Hadoop job instance to be configured
-<<<<<<< .working
- * @param token
- * a valid AccumuloToken (principal must have Table.CREATE
permission)
-=======
- * @param user
+ * @param principal
* a valid Accumulo user name (user must have Table.CREATE
permission)
- * @param passwd
+ * @param token
* the user's password
->>>>>>> .merge-right.r1438353
* @since 1.5.0
*/
- public static void setConnectorInfo(JobConf job, String user, byte[] passwd)
{
- InputConfigurator.setConnectorInfo(CLASS, job, user, passwd);
+ public static void setConnectorInfo(JobConf job, String principal, byte[]
token) {
+ InputConfigurator.setConnectorInfo(CLASS, job, principal, token);
}
/**
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java?rev=1442440&r1=1442439&r2=1442440&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormat.java
Tue Feb 5 00:11:55 2013
@@ -37,7 +37,7 @@ import org.apache.hadoop.mapreduce.TaskA
* The user must specify the following via static configurator methods:
*
* <ul>
- * <li>{@link AccumuloInputFormat#setConnectorInfo(Job, AccumuloToken)} OR
{@link AccumuloInputFormat#setConnectorInfo(Job, Path)}
+ * <li>{@link AccumuloInputFormat#setConnectorInfo(Job, String, byte[])} OR
{@link AccumuloInputFormat#setConnectorInfo(Job, Path)}
* <li>{@link AccumuloInputFormat#setInputTableName(Job, String)}
* <li>{@link AccumuloInputFormat#setScanAuthorizations(Job, Authorizations)}
* <li>{@link AccumuloInputFormat#setZooKeeperInstance(Job, String, String)}
OR {@link AccumuloInputFormat#setMockInstance(Job, String)}
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java?rev=1442440&r1=1442439&r2=1442440&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
Tue Feb 5 00:11:55 2013
@@ -62,7 +62,7 @@ import org.apache.log4j.Logger;
* The user must specify the following via static configurator methods:
*
* <ul>
- * <li>{@link AccumuloOutputFormat#setConnectorInfo(Job, AccumuloToken)} OR
{@link AccumuloOutputFormat#setConnectorInfo(Job, Path)}
+ * <li>{@link AccumuloOutputFormat#setConnectorInfo(Job, String, byte[])} OR
{@link AccumuloOutputFormat#setConnectorInfo(Job, Path)}
* <li>{@link AccumuloOutputFormat#setZooKeeperInstance(Job, String, String)}
OR {@link AccumuloOutputFormat#setMockInstance(Job, String)}
* </ul>
*
@@ -82,19 +82,14 @@ public class AccumuloOutputFormat extend
*
* @param job
* the Hadoop job instance to be configured
-<<<<<<< .working
- * @param token
- * a valid AccumuloToken (principal must have Table.CREATE
permission)
-=======
- * @param user
+ * @param principal
* a valid Accumulo user name (user must have Table.CREATE
permission if {@link #setCreateTables(Job, boolean)} is set to true)
- * @param passwd
+ * @param token
* the user's password
->>>>>>> .merge-right.r1438353
* @since 1.5.0
*/
- public static void setConnectorInfo(Job job, String user, byte[] passwd) {
- OutputConfigurator.setConnectorInfo(CLASS, job.getConfiguration(), user,
passwd);
+ public static void setConnectorInfo(Job job, String principal, byte[] token)
{
+ OutputConfigurator.setConnectorInfo(CLASS, job.getConfiguration(),
principal, token);
}
/**
@@ -530,7 +525,7 @@ public class AccumuloOutputFormat extend
//
----------------------------------------------------------------------------------------------------
/**
- * @deprecated since 1.5.0; Use {@link #setConnectorInfo(Job,
AccumuloToken)}, {@link #setConnectorInfo(Job, Path)}, {@link
#setCreateTables(Job, boolean)},
+ * @deprecated since 1.5.0; Use {@link #setConnectorInfo(Job, String,
byte[])}, {@link #setConnectorInfo(Job, Path)}, {@link #setCreateTables(Job,
boolean)},
* and {@link #setDefaultTableName(Job, String)} instead.
*/
@Deprecated
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java?rev=1442440&r1=1442439&r2=1442440&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormat.java
Tue Feb 5 00:11:55 2013
@@ -39,7 +39,7 @@ import org.apache.hadoop.mapreduce.TaskA
* The user must specify the following via static configurator methods:
*
* <ul>
- * <li>{@link AccumuloRowInputFormat#setConnectorInfo(Job, AccumuloToken)} OR
{@link AccumuloRowInputFormat#setConnectorInfo(Job, Path)}
+ * <li>{@link AccumuloRowInputFormat#setConnectorInfo(Job, String, byte[])} OR
{@link AccumuloRowInputFormat#setConnectorInfo(Job, Path)}
* <li>{@link AccumuloRowInputFormat#setInputTableName(Job, String)}
* <li>{@link AccumuloRowInputFormat#setScanAuthorizations(Job,
Authorizations)}
* <li>{@link AccumuloRowInputFormat#setZooKeeperInstance(Job, String,
String)} OR {@link AccumuloRowInputFormat#setMockInstance(Job, String)}
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java?rev=1442440&r1=1442439&r2=1442440&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
Tue Feb 5 00:11:55 2013
@@ -138,7 +138,7 @@ public class ConfiguratorBase {
* the Hadoop configuration object to configure
* @return true if the connector info has already been set, false otherwise
* @since 1.5.0
- * @see #setConnectorInfo(Class, Configuration, AccumuloToken)
+ * @see #setConnectorInfo(Class, Configuration, String, byte[])
* @see #setConnectorInfo(Class, Configuration, Path)
*/
public static Boolean isConnectorInfoSet(Class<?> implementingClass,
Configuration conf) {
