svn commit: r1453530 [1/12] - in /accumulo/trunk: ./ core/ core/src/main/java/org/apache/accumulo/core/client/ core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/main/java/org/apache/a
Author: vines Date: Wed Mar 6 20:17:29 2013 New Revision: 1453530 URL: http://svn.apache.org/r1453530 Log: ACCUMULO-259 Changing the thrift getAuthentictorClass from a master operation to a tserver one Modified: accumulo/trunk/ (props changed) accumulo/trunk/core/ (props changed) accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/Instance.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ConfigurationType.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/SecurityErrorCode.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperation.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperationExceptionType.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftSecurityException.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTableOperationException.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialScan.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/IterInfo.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/MapFileInfo.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/TColumn.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/TConstraintViolationSummary.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyExtent.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyValue.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/Compacting.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/DeadServer.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterState.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryException.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/TableOperation.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletLoadState.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/thrift/AuthInfo.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/thrift/SecurityErrorCode.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/thrift/TCredentials.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/security/thrift/ThriftSecurityException.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
svn commit: r1453530 [9/12] - in /accumulo/trunk: ./ core/ core/src/main/java/org/apache/accumulo/core/client/ core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/main/java/org/apache/a
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java?rev=1453530r1=1453529r2=1453530view=diff
==
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
Wed Mar 6 20:17:29 2013
@@ -161,21 +161,21 @@ import org.slf4j.LoggerFactory;
public static final Map_Fields, org.apache.thrift.meta_data.FieldMetaData
metaDataMap;
static {
Map_Fields, org.apache.thrift.meta_data.FieldMetaData tmpMap = new
EnumMap_Fields, org.apache.thrift.meta_data.FieldMetaData(_Fields.class);
-tmpMap.put(_Fields.EXTENT, new
org.apache.thrift.meta_data.FieldMetaData(extent,
org.apache.thrift.TFieldRequirementType.DEFAULT,
+tmpMap.put(_Fields.EXTENT, new
org.apache.thrift.meta_data.FieldMetaData(extent,
org.apache.thrift.TFieldRequirementType.DEFAULT,
new
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
org.apache.accumulo.core.data.thrift.TKeyExtent.class)));
-tmpMap.put(_Fields.MAJORS, new
org.apache.thrift.meta_data.FieldMetaData(majors,
org.apache.thrift.TFieldRequirementType.DEFAULT,
+tmpMap.put(_Fields.MAJORS, new
org.apache.thrift.meta_data.FieldMetaData(majors,
org.apache.thrift.TFieldRequirementType.DEFAULT,
new
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
ActionStats.class)));
-tmpMap.put(_Fields.MINORS, new
org.apache.thrift.meta_data.FieldMetaData(minors,
org.apache.thrift.TFieldRequirementType.DEFAULT,
+tmpMap.put(_Fields.MINORS, new
org.apache.thrift.meta_data.FieldMetaData(minors,
org.apache.thrift.TFieldRequirementType.DEFAULT,
new
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
ActionStats.class)));
-tmpMap.put(_Fields.SPLITS, new
org.apache.thrift.meta_data.FieldMetaData(splits,
org.apache.thrift.TFieldRequirementType.DEFAULT,
+tmpMap.put(_Fields.SPLITS, new
org.apache.thrift.meta_data.FieldMetaData(splits,
org.apache.thrift.TFieldRequirementType.DEFAULT,
new
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
ActionStats.class)));
-tmpMap.put(_Fields.NUM_ENTRIES, new
org.apache.thrift.meta_data.FieldMetaData(numEntries,
org.apache.thrift.TFieldRequirementType.DEFAULT,
+tmpMap.put(_Fields.NUM_ENTRIES, new
org.apache.thrift.meta_data.FieldMetaData(numEntries,
org.apache.thrift.TFieldRequirementType.DEFAULT,
new
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-tmpMap.put(_Fields.INGEST_RATE, new
org.apache.thrift.meta_data.FieldMetaData(ingestRate,
org.apache.thrift.TFieldRequirementType.DEFAULT,
+tmpMap.put(_Fields.INGEST_RATE, new
org.apache.thrift.meta_data.FieldMetaData(ingestRate,
org.apache.thrift.TFieldRequirementType.DEFAULT,
new
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-tmpMap.put(_Fields.QUERY_RATE, new
org.apache.thrift.meta_data.FieldMetaData(queryRate,
org.apache.thrift.TFieldRequirementType.DEFAULT,
+tmpMap.put(_Fields.QUERY_RATE, new
org.apache.thrift.meta_data.FieldMetaData(queryRate,
org.apache.thrift.TFieldRequirementType.DEFAULT,
new
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-tmpMap.put(_Fields.SPLIT_CREATION_TIME, new
org.apache.thrift.meta_data.FieldMetaData(splitCreationTime,
org.apache.thrift.TFieldRequirementType.DEFAULT,
+tmpMap.put(_Fields.SPLIT_CREATION_TIME, new
org.apache.thrift.meta_data.FieldMetaData(splitCreationTime,
org.apache.thrift.TFieldRequirementType.DEFAULT,
new
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TabletStats.class,
metaDataMap);
@@ -867,7 +867,7 @@ import org.slf4j.LoggerFactory;
while (true)
{
schemeField = iprot.readFieldBegin();
-if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (schemeField.id) {
@@ -876,7 +876,7 @@ import org.slf4j.LoggerFactory;
struct.extent = new
org.apache.accumulo.core.data.thrift.TKeyExtent();
struct.extent.read(iprot);
struct.setExtentIsSet(true);
-} else {
+} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot,
schemeField.type);
svn commit: r1453530 [12/12] - in /accumulo/trunk: ./ core/ core/src/main/java/org/apache/accumulo/core/client/ core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/main/java/org/apache/
Modified:
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TimeType.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TimeType.java?rev=1453530r1=1453529r2=1453530view=diff
==
---
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TimeType.java
(original)
+++
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TimeType.java
Wed Mar 6 20:17:29 2013
@@ -48,7 +48,7 @@ import org.apache.thrift.TEnum;
* Find a the enum type by its integer value, as defined in the Thrift IDL.
* @return null if the value is not found.
*/
- public static TimeType findByValue(int value) {
+ public static TimeType findByValue(int value) {
switch (value) {
case 0:
return LOGICAL;
Modified:
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownScanner.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownScanner.java?rev=1453530r1=1453529r2=1453530view=diff
==
---
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownScanner.java
(original)
+++
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownScanner.java
Wed Mar 6 20:17:29 2013
@@ -121,7 +121,7 @@ import org.slf4j.LoggerFactory;
public static final Map_Fields, org.apache.thrift.meta_data.FieldMetaData
metaDataMap;
static {
Map_Fields, org.apache.thrift.meta_data.FieldMetaData tmpMap = new
EnumMap_Fields, org.apache.thrift.meta_data.FieldMetaData(_Fields.class);
-tmpMap.put(_Fields.MSG, new
org.apache.thrift.meta_data.FieldMetaData(msg,
org.apache.thrift.TFieldRequirementType.DEFAULT,
+tmpMap.put(_Fields.MSG, new
org.apache.thrift.meta_data.FieldMetaData(msg,
org.apache.thrift.TFieldRequirementType.DEFAULT,
new
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(UnknownScanner.class,
metaDataMap);
@@ -328,7 +328,7 @@ import org.slf4j.LoggerFactory;
while (true)
{
schemeField = iprot.readFieldBegin();
-if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (schemeField.id) {
@@ -336,7 +336,7 @@ import org.slf4j.LoggerFactory;
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.msg = iprot.readString();
struct.setMsgIsSet(true);
-} else {
+} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot,
schemeField.type);
}
break;
Modified:
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownWriter.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownWriter.java?rev=1453530r1=1453529r2=1453530view=diff
==
---
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownWriter.java
(original)
+++
accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/UnknownWriter.java
Wed Mar 6 20:17:29 2013
@@ -121,7 +121,7 @@ import org.slf4j.LoggerFactory;
public static final Map_Fields, org.apache.thrift.meta_data.FieldMetaData
metaDataMap;
static {
Map_Fields, org.apache.thrift.meta_data.FieldMetaData tmpMap = new
EnumMap_Fields, org.apache.thrift.meta_data.FieldMetaData(_Fields.class);
-tmpMap.put(_Fields.MSG, new
org.apache.thrift.meta_data.FieldMetaData(msg,
org.apache.thrift.TFieldRequirementType.DEFAULT,
+tmpMap.put(_Fields.MSG, new
org.apache.thrift.meta_data.FieldMetaData(msg,
org.apache.thrift.TFieldRequirementType.DEFAULT,
new
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(UnknownWriter.class,
metaDataMap);
@@ -328,7 +328,7 @@ import org.slf4j.LoggerFactory;
while (true)
{
schemeField = iprot.readFieldBegin();
-if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (schemeField.id) {
@@ -336,7 +336,7 @@ import org.slf4j.LoggerFactory;
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.msg = iprot.readString();
struct.setMsgIsSet(true);
-} else {
+
svn commit: r1453530 [7/12] - in /accumulo/trunk: ./ core/ core/src/main/java/org/apache/accumulo/core/client/ core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/main/java/org/apache/a
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java?rev=1453530r1=1453529r2=1453530view=diff
==
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
Wed Mar 6 20:17:29 2013
@@ -74,12 +74,12 @@ import org.slf4j.LoggerFactory;
public long age; // required
public long idleTime; // required
/**
- *
+ *
* @see ScanType
*/
public ScanType type; // required
/**
- *
+ *
* @see ScanState
*/
public ScanState state; // required
@@ -97,12 +97,12 @@ import org.slf4j.LoggerFactory;
AGE((short)5, age),
IDLE_TIME((short)6, idleTime),
/**
- *
+ *
* @see ScanType
*/
TYPE((short)7, type),
/**
- *
+ *
* @see ScanState
*/
STATE((short)8, state),
@@ -195,36 +195,36 @@ import org.slf4j.LoggerFactory;
public static final Map_Fields, org.apache.thrift.meta_data.FieldMetaData
metaDataMap;
static {
Map_Fields, org.apache.thrift.meta_data.FieldMetaData tmpMap = new
EnumMap_Fields, org.apache.thrift.meta_data.FieldMetaData(_Fields.class);
-tmpMap.put(_Fields.CLIENT, new
org.apache.thrift.meta_data.FieldMetaData(client,
org.apache.thrift.TFieldRequirementType.DEFAULT,
+tmpMap.put(_Fields.CLIENT, new
org.apache.thrift.meta_data.FieldMetaData(client,
org.apache.thrift.TFieldRequirementType.DEFAULT,
new
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-tmpMap.put(_Fields.USER, new
org.apache.thrift.meta_data.FieldMetaData(user,
org.apache.thrift.TFieldRequirementType.DEFAULT,
+tmpMap.put(_Fields.USER, new
org.apache.thrift.meta_data.FieldMetaData(user,
org.apache.thrift.TFieldRequirementType.DEFAULT,
new
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-tmpMap.put(_Fields.TABLE_ID, new
org.apache.thrift.meta_data.FieldMetaData(tableId,
org.apache.thrift.TFieldRequirementType.DEFAULT,
+tmpMap.put(_Fields.TABLE_ID, new
org.apache.thrift.meta_data.FieldMetaData(tableId,
org.apache.thrift.TFieldRequirementType.DEFAULT,
new
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-tmpMap.put(_Fields.AGE, new
org.apache.thrift.meta_data.FieldMetaData(age,
org.apache.thrift.TFieldRequirementType.DEFAULT,
+tmpMap.put(_Fields.AGE, new
org.apache.thrift.meta_data.FieldMetaData(age,
org.apache.thrift.TFieldRequirementType.DEFAULT,
new
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-tmpMap.put(_Fields.IDLE_TIME, new
org.apache.thrift.meta_data.FieldMetaData(idleTime,
org.apache.thrift.TFieldRequirementType.DEFAULT,
+tmpMap.put(_Fields.IDLE_TIME, new
org.apache.thrift.meta_data.FieldMetaData(idleTime,
org.apache.thrift.TFieldRequirementType.DEFAULT,
new
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-tmpMap.put(_Fields.TYPE, new
org.apache.thrift.meta_data.FieldMetaData(type,
org.apache.thrift.TFieldRequirementType.DEFAULT,
+tmpMap.put(_Fields.TYPE, new
org.apache.thrift.meta_data.FieldMetaData(type,
org.apache.thrift.TFieldRequirementType.DEFAULT,
new
org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM,
ScanType.class)));
-tmpMap.put(_Fields.STATE, new
org.apache.thrift.meta_data.FieldMetaData(state,
org.apache.thrift.TFieldRequirementType.DEFAULT,
+tmpMap.put(_Fields.STATE, new
org.apache.thrift.meta_data.FieldMetaData(state,
org.apache.thrift.TFieldRequirementType.DEFAULT,
new
org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM,
ScanState.class)));
-tmpMap.put(_Fields.EXTENT, new
org.apache.thrift.meta_data.FieldMetaData(extent,
org.apache.thrift.TFieldRequirementType.DEFAULT,
+tmpMap.put(_Fields.EXTENT, new
org.apache.thrift.meta_data.FieldMetaData(extent,
org.apache.thrift.TFieldRequirementType.DEFAULT,
new
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
org.apache.accumulo.core.data.thrift.TKeyExtent.class)));
-tmpMap.put(_Fields.COLUMNS, new
org.apache.thrift.meta_data.FieldMetaData(columns,
org.apache.thrift.TFieldRequirementType.DEFAULT,
-new
org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+tmpMap.put(_Fields.COLUMNS, new
org.apache.thrift.meta_data.FieldMetaData(columns,
org.apache.thrift.TFieldRequirementType.DEFAULT,
+new
svn commit: r1453577 - in /accumulo/trunk: ./ core/ core/src/main/java/org/apache/accumulo/core/util/LoginProperties.java core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java start/src/ma
Author: vines
Date: Wed Mar 6 21:26:52 2013
New Revision: 1453577
URL: http://svn.apache.org/r1453577
Log:
ACCUMULO-1157 - bin/accumulo login-info will now dump properties.
Also, undeprecated a private method in the shell
Added:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/LoginProperties.java
- copied unchanged from r1453576,
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/LoginProperties.java
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
accumulo/trunk/start/src/main/java/org/apache/accumulo/start/Main.java
Propchange: accumulo/trunk/
--
Merged /accumulo/branches/1.5:r1453519-1453576
Propchange: accumulo/trunk/core/
--
Merged /accumulo/branches/1.5/core:r1453519-1453576
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1453577r1=1453576r2=1453577view=diff
==
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
Wed Mar 6 21:26:52 2013
@@ -362,10 +362,7 @@ public class Shell extends ShellOptions
}
}
- /**
- * @deprecated Not for client use
- */
- @Deprecated
+ @SuppressWarnings(deprecation)
private static Instance getDefaultInstance(AccumuloConfiguration conf) {
String keepers = conf.get(Property.INSTANCE_ZK_HOST);
Path instanceDir = new Path(conf.get(Property.INSTANCE_DFS_DIR),
instance_id);
Modified: accumulo/trunk/start/src/main/java/org/apache/accumulo/start/Main.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/start/src/main/java/org/apache/accumulo/start/Main.java?rev=1453577r1=1453576r2=1453577view=diff
==
--- accumulo/trunk/start/src/main/java/org/apache/accumulo/start/Main.java
(original)
+++ accumulo/trunk/start/src/main/java/org/apache/accumulo/start/Main.java Wed
Mar 6 21:26:52 2013
@@ -115,6 +115,6 @@ public class Main {
}
private static void printUsage() {
-System.out.println(accumulo init | master | tserver | monitor | shell |
admin | gc | classpath | rfile-info | tracer | proxy | accumulo class args);
+System.out.println(accumulo init | master | tserver | monitor | shell |
admin | gc | classpath | rfile-info | login-info | tracer | proxy | accumulo
class args);
}
}
svn commit: r1453602 - in /accumulo/branches/1.5: core/src/main/java/org/apache/accumulo/core/security/handler/ core/src/main/java/org/apache/accumulo/core/util/shell/ test/src/main/java/org/apache/ac
Author: vines
Date: Wed Mar 6 22:50:12 2013
New Revision: 1453602
URL: http://svn.apache.org/r1453602
Log:
ACCUMULO-1159 - Shell now supports AuthenticationToken
Modified:
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/security/handler/Authenticator.java
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/security/handler/ZKAuthenticator.java
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptions.java
accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/security/WalkingSecurity.java
Modified:
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/security/handler/Authenticator.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/security/handler/Authenticator.java?rev=1453602r1=1453601r2=1453602view=diff
==
---
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/security/handler/Authenticator.java
(original)
+++
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/security/handler/Authenticator.java
Wed Mar 6 22:50:12 2013
@@ -30,10 +30,12 @@ public interface Authenticator {
public class AuthProperty {
private String key, description;
+private boolean masked;
-public AuthProperty(String name, String description) {
+public AuthProperty(String name, String description, boolean mask) {
this.key = name;
this.description = description;
+ this.masked = mask;
}
public String toString() {
@@ -47,5 +49,9 @@ public interface Authenticator {
public String getDescription() {
return this.description;
}
+
+public boolean getMask() {
+ return this.masked;
+}
}
}
Modified:
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/security/handler/ZKAuthenticator.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/security/handler/ZKAuthenticator.java?rev=1453602r1=1453601r2=1453602view=diff
==
---
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/security/handler/ZKAuthenticator.java
(original)
+++
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/security/handler/ZKAuthenticator.java
Wed Mar 6 22:50:12 2013
@@ -43,7 +43,7 @@ public class ZKAuthenticator implements
public ListSetAuthProperty getProperties() {
ListSetAuthProperty toRet = new LinkedListSetAuthProperty();
SetAuthProperty internal = new TreeSetAuthProperty();
-internal.add(new AuthProperty(password, the password for the
principal));
+internal.add(new AuthProperty(password, the password for the
principal, true));
toRet.add(internal);
return toRet;
}
Modified:
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1453602r1=1453601r2=1453602view=diff
==
---
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
(original)
+++
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
Wed Mar 6 22:50:12 2013
@@ -30,6 +30,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Properties;
import java.util.Set;
import java.util.TreeMap;
import java.util.UUID;
@@ -54,6 +55,7 @@ import org.apache.accumulo.core.data.Key
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.data.thrift.TConstraintViolationSummary;
import org.apache.accumulo.core.security.AuditLevel;
+import org.apache.accumulo.core.security.handler.Authenticator;
import
org.apache.accumulo.core.tabletserver.thrift.ConstraintViolationException;
import org.apache.accumulo.core.trace.DistributedTrace;
import org.apache.accumulo.core.util.BadArgumentException;
@@ -244,17 +246,28 @@ public class Shell extends ShellOptions
String sysUser = System.getProperty(user.name);
if (sysUser == null)
sysUser = root;
-String user = cl.getOptionValue(usernameOption.getOpt(), sysUser);
+String user = cl.getOptionValue(usernameOption.getOpt());
+String principal = cl.getOptionValue(principalOption.getOpt(), sysUser);
String passw = cl.getOptionValue(passwOption.getOpt(), null);
tabCompletion = !cl.hasOption(tabCompleteOption.getLongOpt());
+String[] loginOptions = cl.getOptionValues(loginOption.getOpt());
// Use a fake (Mock), ZK, or HdfsZK Accumulo instance
setInstance(cl);
svn commit: r1453614 - in /accumulo/trunk: ./ core/ core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
Author: vines
Date: Wed Mar 6 23:17:15 2013
New Revision: 1453614
URL: http://svn.apache.org/r1453614
Log:
ACCUMULO-1155 - CLI properties!
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
Propchange: accumulo/trunk/
--
Merged /accumulo/branches/1.5:r1453603-1453612
Propchange: accumulo/trunk/core/
--
Merged /accumulo/branches/1.5/core:r1453603-1453612
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java?rev=1453614r1=1453613r2=1453614view=diff
==
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
Wed Mar 6 23:17:15 2013
@@ -18,7 +18,10 @@ package org.apache.accumulo.core.cli;
import java.nio.charset.Charset;
import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
import java.util.Map.Entry;
+import java.util.Properties;
import java.util.TreeMap;
import java.util.UUID;
@@ -46,6 +49,7 @@ import org.apache.hadoop.mapreduce.Job;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
+import com.beust.jcommander.DynamicParameter;
import com.beust.jcommander.IStringConverter;
import com.beust.jcommander.Parameter;
@@ -108,13 +112,33 @@ public class ClientOpts extends Help {
@Parameter(names = --password, converter = PasswordConverter.class,
description = Enter the connection password, password = true)
public Password securePassword = null;
+ @DynamicParameter(names = -l,
+ description = login properties in the format key=value. Reuse -l for
each property (prompt for properties if this option is missing)
+ public MapString,String loginProps = new LinkedHashMapString,String();
+
public AuthenticationToken getToken() {
-if (securePassword == null) {
- if (password == null)
-return null;
+if (!loginProps.isEmpty()) {
+ Properties props = new Properties();
+ for (EntryString,String loginOption : loginProps.entrySet())
+props.put(loginOption.getKey(), loginOption.getValue());
+
+ try {
+System.out.println(props);
+return getInstance().getAuthenticator().login(props);
+ } catch (AccumuloSecurityException e) {
+throw new RuntimeException(e);
+ } catch (AccumuloException e) {
+throw new RuntimeException(e);
+ }
+}
+
+if (securePassword != null)
+ return new PasswordToken(securePassword.value);
+
+if (password != null)
return new PasswordToken(password.value);
-}
-return new PasswordToken(securePassword.value);
+
+return null;
}
@Parameter(names = {-z, --keepers}, description = Comma separated list
of zookeeper hosts (host:port,host:port))
svn commit: r1453623 - in /accumulo/branches/1.5: conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/ conf/examples/2GB/native-standalone/ conf/examples/2GB/standalone/ conf/examples/3G
Author: vines Date: Wed Mar 6 23:55:55 2013 New Revision: 1453623 URL: http://svn.apache.org/r1453623 Log: ACCUMULO-1156 - a good start on killing use of deprecated code Modified: accumulo/branches/1.5/conf/examples/1GB/native-standalone/accumulo-site.xml accumulo/branches/1.5/conf/examples/1GB/standalone/accumulo-site.xml accumulo/branches/1.5/conf/examples/2GB/native-standalone/accumulo-site.xml accumulo/branches/1.5/conf/examples/2GB/standalone/accumulo-site.xml accumulo/branches/1.5/conf/examples/3GB/native-standalone/accumulo-site.xml accumulo/branches/1.5/conf/examples/3GB/standalone/accumulo-site.xml accumulo/branches/1.5/conf/examples/512MB/native-standalone/accumulo-site.xml accumulo/branches/1.5/conf/examples/512MB/standalone/accumulo-site.xml accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/conf/Property.java accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/Basic.java Modified: accumulo/branches/1.5/conf/examples/1GB/native-standalone/accumulo-site.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/1GB/native-standalone/accumulo-site.xml?rev=1453623r1=1453622r2=1453623view=diff == --- accumulo/branches/1.5/conf/examples/1GB/native-standalone/accumulo-site.xml (original) +++ accumulo/branches/1.5/conf/examples/1GB/native-standalone/accumulo-site.xml Wed Mar 6 23:55:55 2013 @@ -59,13 +59,13 @@ /property property -nametrace.password/name +nametrace.login.password/name !-- change this to the root user's password, and/or change the user below -- -valuesecret/value +valuepassword=secret/value /property property -nametrace.user/name +nametrace.principal/name valueroot/value /property Modified: accumulo/branches/1.5/conf/examples/1GB/standalone/accumulo-site.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/1GB/standalone/accumulo-site.xml?rev=1453623r1=1453622r2=1453623view=diff == --- accumulo/branches/1.5/conf/examples/1GB/standalone/accumulo-site.xml (original) +++ accumulo/branches/1.5/conf/examples/1GB/standalone/accumulo-site.xml Wed Mar 6 23:55:55 2013 @@ -59,13 +59,13 @@ /property property -nametrace.password/name +nametrace.login.password/name !-- change this to the root user's password, and/or change the user below -- -valuesecret/value +valuepassword=secret/value /property property -nametrace.user/name +nametrace.principal/name valueroot/value /property Modified: accumulo/branches/1.5/conf/examples/2GB/native-standalone/accumulo-site.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/2GB/native-standalone/accumulo-site.xml?rev=1453623r1=1453622r2=1453623view=diff == --- accumulo/branches/1.5/conf/examples/2GB/native-standalone/accumulo-site.xml (original) +++ accumulo/branches/1.5/conf/examples/2GB/native-standalone/accumulo-site.xml Wed Mar 6 23:55:55 2013 @@ -59,13 +59,13 @@ /property property -nametrace.password/name +nametrace.login.password/name !-- change this to the root user's password, and/or change the user below -- -valuesecret/value +valuepassword=secret/value /property property -nametrace.user/name +nametrace.principal/name valueroot/value /property Modified: accumulo/branches/1.5/conf/examples/2GB/standalone/accumulo-site.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/2GB/standalone/accumulo-site.xml?rev=1453623r1=1453622r2=1453623view=diff == --- accumulo/branches/1.5/conf/examples/2GB/standalone/accumulo-site.xml (original) +++ accumulo/branches/1.5/conf/examples/2GB/standalone/accumulo-site.xml Wed Mar 6 23:55:55 2013 @@ -65,15 +65,15 @@ /property property - nametrace.password/name + nametrace.login.password/name !-- change this to the root user's password, and/or change the user below -- - valuesecret/value + valuepassword=secret/value /property property - nametrace.user/name + nametrace.principal/name valueroot/value /property Modified: accumulo/branches/1.5/conf/examples/3GB/native-standalone/accumulo-site.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/3GB/native-standalone/accumulo-site.xml?rev=1453623r1=1453622r2=1453623view=diff == ---
svn commit: r1453624 - in /accumulo/trunk: ./ conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/ conf/examples/2GB/native-standalone/ conf/examples/2GB/standalone/ conf/examples/3GB/na
Author: vines Date: Wed Mar 6 23:56:41 2013 New Revision: 1453624 URL: http://svn.apache.org/r1453624 Log: ACCUMULO-1156 - a good start on killing use of deprecated code Modified: accumulo/trunk/ (props changed) accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-site.xml accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-site.xml accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-site.xml accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-site.xml accumulo/trunk/conf/examples/512MB/standalone/accumulo-site.xml accumulo/trunk/core/ (props changed) accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Property.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java accumulo/trunk/server/ (props changed) accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/Basic.java Propchange: accumulo/trunk/ -- Merged /accumulo/branches/1.5:r1453613-1453623 Modified: accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-site.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-site.xml?rev=1453624r1=1453623r2=1453624view=diff == --- accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-site.xml (original) +++ accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-site.xml Wed Mar 6 23:56:41 2013 @@ -59,13 +59,13 @@ /property property -nametrace.password/name +nametrace.login.password/name !-- change this to the root user's password, and/or change the user below -- -valuesecret/value +valuepassword=secret/value /property property -nametrace.user/name +nametrace.principal/name valueroot/value /property Modified: accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml?rev=1453624r1=1453623r2=1453624view=diff == --- accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml (original) +++ accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml Wed Mar 6 23:56:41 2013 @@ -59,13 +59,13 @@ /property property -nametrace.password/name +nametrace.login.password/name !-- change this to the root user's password, and/or change the user below -- -valuesecret/value +valuepassword=secret/value /property property -nametrace.user/name +nametrace.principal/name valueroot/value /property Modified: accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-site.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-site.xml?rev=1453624r1=1453623r2=1453624view=diff == --- accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-site.xml (original) +++ accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-site.xml Wed Mar 6 23:56:41 2013 @@ -59,13 +59,13 @@ /property property -nametrace.password/name +nametrace.login.password/name !-- change this to the root user's password, and/or change the user below -- -valuesecret/value +valuepassword=secret/value /property property -nametrace.user/name +nametrace.principal/name valueroot/value /property Modified: accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml?rev=1453624r1=1453623r2=1453624view=diff == --- accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml (original) +++ accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml Wed Mar 6 23:56:41 2013 @@ -65,15 +65,15 @@ /property property - nametrace.password/name + nametrace.login.password/name !-- change this to the root user's password, and/or change the user below -- - valuesecret/value + valuepassword=secret/value /property property - nametrace.user/name + nametrace.principal/name valueroot/value /property Modified: accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-site.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-site.xml?rev=1453624r1=1453623r2=1453624view=diff
svn commit: r1453653 - in /accumulo/trunk: contrib/Eclipse-Accumulo-Codestyle.xml contrib/checkstyle/checkstyle.xml pom.xml
Author: medined Date: Thu Mar 7 01:49:17 2013 New Revision: 1453653 URL: http://svn.apache.org/r1453653 Log: ACCUMULO-1158: changed eclipse code style so spaces are not added to blank lines. changed pom.xml so that thrift directories are excluded from checkstyle. Added NewlineAtEndOfFile rule to checkstyle since all files pass. Modified: accumulo/trunk/contrib/Eclipse-Accumulo-Codestyle.xml accumulo/trunk/contrib/checkstyle/checkstyle.xml accumulo/trunk/pom.xml Modified: accumulo/trunk/contrib/Eclipse-Accumulo-Codestyle.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/contrib/Eclipse-Accumulo-Codestyle.xml?rev=1453653r1=1453652r2=1453653view=diff == --- accumulo/trunk/contrib/Eclipse-Accumulo-Codestyle.xml (original) +++ accumulo/trunk/contrib/Eclipse-Accumulo-Codestyle.xml Thu Mar 7 01:49:17 2013 @@ -1,20 +1,4 @@ ?xml version=1.0 encoding=UTF-8 standalone=no? -!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the License); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an AS IS BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. --- profiles version=12 profile kind=CodeFormatterProfile name=Accumulo version=12 setting id=org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags value=insert/ @@ -175,7 +159,7 @@ setting id=org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration value=16/ setting id=org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator value=insert/ setting id=org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator value=insert/ -setting id=org.eclipse.jdt.core.formatter.indent_empty_lines value=true/ +setting id=org.eclipse.jdt.core.formatter.indent_empty_lines value=false/ setting id=org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized value=do not insert/ setting id=org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast value=insert/ setting id=org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters value=insert/ Modified: accumulo/trunk/contrib/checkstyle/checkstyle.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/contrib/checkstyle/checkstyle.xml?rev=1453653r1=1453652r2=1453653view=diff == Binary files - no diff available. Modified: accumulo/trunk/pom.xml URL: http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1453653r1=1453652r2=1453653view=diff == --- accumulo/trunk/pom.xml (original) +++ accumulo/trunk/pom.xml Thu Mar 7 01:49:17 2013 @@ -78,6 +78,7 @@ version2.10/version configuration configLocationcontrib/checkstyle/checkstyle.xml/configLocation + excludes**/thrift/*.java/excludes /configuration /plugin plugin
