accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [53/53] [abbrv] git commit: Merge branch 'master' into ACCUMULO-378
Date Tue, 08 Apr 2014 03:03:49 GMT
Merge branch 'master' into ACCUMULO-378


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5fd07ec0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5fd07ec0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5fd07ec0

Branch: refs/heads/ACCUMULO-378
Commit: 5fd07ec03059daa21758404de0c059a2dd5c395a
Parents: e01c8d9 1b4c49c
Author: Josh Elser <elserj@apache.org>
Authored: Mon Apr 7 23:02:05 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Mon Apr 7 23:02:05 2014 -0400

----------------------------------------------------------------------
 README                                          |   40 +-
 assemble/build.sh                               |    8 +-
 assemble/src/main/assemblies/component.xml      |    3 +
 bin/bootstrap_config.sh                         |  321 ++++-
 conf/templates/accumulo-env.sh                  |   66 +
 conf/templates/accumulo-metrics.xml             |   60 +
 conf/templates/accumulo-site.xml                |  132 ++
 conf/templates/accumulo.policy.example          |  143 +++
 conf/templates/auditLog.xml                     |   35 +
 conf/templates/gc                               |   16 +
 conf/templates/generic_logger.xml               |   83 ++
 conf/templates/log4j.properties                 |   41 +
 conf/templates/masters                          |   16 +
 conf/templates/monitor                          |   16 +
 conf/templates/monitor_logger.xml               |   64 +
 conf/templates/slaves                           |   16 +
 conf/templates/tracers                          |   16 +
 core/pom.xml                                    |   19 -
 .../core/client/mapred/InputFormatBase.java     |    1 +
 .../client/mapreduce/AccumuloInputFormat.java   |    2 +-
 .../core/client/mapreduce/InputFormatBase.java  |    1 +
 .../accumulo/core/client/mock/MockShell.java    |  142 ---
 .../core/util/format/DeleterFormatter.java      |  101 --
 .../apache/accumulo/core/util/shell/Shell.java  | 1168 ------------------
 .../core/util/shell/ShellCommandException.java  |   59 -
 .../core/util/shell/ShellCompletor.java         |  162 ---
 .../core/util/shell/ShellExtension.java         |   27 -
 .../accumulo/core/util/shell/ShellOptions.java  |   33 -
 .../core/util/shell/ShellOptionsJC.java         |  280 -----
 .../accumulo/core/util/shell/ShellUtil.java     |   60 -
 .../apache/accumulo/core/util/shell/Token.java  |  137 --
 .../core/util/shell/commands/AboutCommand.java  |   56 -
 .../commands/ActiveCompactionIterator.java      |  136 --
 .../util/shell/commands/ActiveScanIterator.java |   91 --
 .../util/shell/commands/AddAuthsCommand.java    |   82 --
 .../util/shell/commands/AddSplitsCommand.java   |   88 --
 .../shell/commands/AuthenticateCommand.java     |   66 -
 .../core/util/shell/commands/ByeCommand.java    |   19 -
 .../util/shell/commands/ClasspathCommand.java   |   55 -
 .../core/util/shell/commands/ClearCommand.java  |   52 -
 .../util/shell/commands/CloneTableCommand.java  |  102 --
 .../core/util/shell/commands/ClsCommand.java    |   19 -
 .../util/shell/commands/CompactCommand.java     |  129 --
 .../core/util/shell/commands/ConfigCommand.java |  315 -----
 .../util/shell/commands/ConstraintCommand.java  |  134 --
 .../shell/commands/CreateNamespaceCommand.java  |   99 --
 .../util/shell/commands/CreateTableCommand.java |  203 ---
 .../util/shell/commands/CreateUserCommand.java  |   76 --
 .../core/util/shell/commands/DUCommand.java     |  124 --
 .../core/util/shell/commands/DebugCommand.java  |   71 --
 .../core/util/shell/commands/DeleteCommand.java |  112 --
 .../util/shell/commands/DeleteIterCommand.java  |  114 --
 .../util/shell/commands/DeleteManyCommand.java  |   82 --
 .../shell/commands/DeleteNamespaceCommand.java  |  100 --
 .../util/shell/commands/DeleteRowsCommand.java  |   65 -
 .../shell/commands/DeleteScanIterCommand.java   |  102 --
 .../shell/commands/DeleteShellIterCommand.java  |  100 --
 .../util/shell/commands/DeleteTableCommand.java |   60 -
 .../util/shell/commands/DeleteUserCommand.java  |   19 -
 .../util/shell/commands/DropTableCommand.java   |   19 -
 .../util/shell/commands/DropUserCommand.java    |   61 -
 .../core/util/shell/commands/EGrepCommand.java  |   59 -
 .../util/shell/commands/ExecfileCommand.java    |   67 -
 .../core/util/shell/commands/ExitCommand.java   |   39 -
 .../util/shell/commands/ExportTableCommand.java |   78 --
 .../util/shell/commands/ExtensionCommand.java   |  102 --
 .../core/util/shell/commands/FateCommand.java   |  180 ---
 .../core/util/shell/commands/FlushCommand.java  |   63 -
 .../util/shell/commands/FormatterCommand.java   |   69 --
 .../util/shell/commands/GetAuthsCommand.java    |   67 -
 .../util/shell/commands/GetGroupsCommand.java   |   60 -
 .../util/shell/commands/GetSplitsCommand.java   |  155 ---
 .../core/util/shell/commands/GrantCommand.java  |  133 --
 .../core/util/shell/commands/GrepCommand.java   |  111 --
 .../core/util/shell/commands/HelpCommand.java   |  129 --
 .../core/util/shell/commands/HiddenCommand.java |   62 -
 .../util/shell/commands/HistoryCommand.java     |   82 --
 .../shell/commands/ImportDirectoryCommand.java  |   58 -
 .../util/shell/commands/ImportTableCommand.java |   51 -
 .../core/util/shell/commands/InfoCommand.java   |   19 -
 .../core/util/shell/commands/InsertCommand.java |  148 ---
 .../util/shell/commands/InterpreterCommand.java |   40 -
 .../shell/commands/ListCompactionsCommand.java  |   78 --
 .../util/shell/commands/ListIterCommand.java    |  140 ---
 .../util/shell/commands/ListScansCommand.java   |   78 --
 .../shell/commands/ListShellIterCommand.java    |  105 --
 .../core/util/shell/commands/MaxRowCommand.java |   55 -
 .../core/util/shell/commands/MergeCommand.java  |  111 --
 .../commands/NamespacePermissionsCommand.java   |   44 -
 .../util/shell/commands/NamespacesCommand.java  |   83 --
 .../util/shell/commands/NoTableCommand.java     |   40 -
 .../util/shell/commands/OfflineCommand.java     |   61 -
 .../core/util/shell/commands/OnlineCommand.java |   61 -
 .../core/util/shell/commands/OptUtil.java       |  146 ---
 .../core/util/shell/commands/PasswdCommand.java |   96 --
 .../core/util/shell/commands/PingCommand.java   |   82 --
 .../core/util/shell/commands/PingIterator.java  |   58 -
 .../util/shell/commands/QuestionCommand.java    |   24 -
 .../core/util/shell/commands/QuitCommand.java   |   19 -
 .../shell/commands/QuotedStringTokenizer.java   |  141 ---
 .../shell/commands/RenameNamespaceCommand.java  |   79 --
 .../util/shell/commands/RenameTableCommand.java |   62 -
 .../core/util/shell/commands/RevokeCommand.java |  133 --
 .../core/util/shell/commands/ScanCommand.java   |  334 -----
 .../core/util/shell/commands/ScriptCommand.java |  290 -----
 .../util/shell/commands/SetAuthsCommand.java    |   77 --
 .../util/shell/commands/SetGroupsCommand.java   |   78 --
 .../util/shell/commands/SetIterCommand.java     |  453 -------
 .../util/shell/commands/SetScanIterCommand.java |  127 --
 .../shell/commands/SetShellIterCommand.java     |  131 --
 .../ShellPluginConfigurationCommand.java        |  146 ---
 .../core/util/shell/commands/SleepCommand.java  |   46 -
 .../commands/SystemPermissionsCommand.java      |   44 -
 .../core/util/shell/commands/TableCommand.java  |   60 -
 .../util/shell/commands/TableOperation.java     |  153 ---
 .../shell/commands/TablePermissionsCommand.java |   44 -
 .../core/util/shell/commands/TablesCommand.java |  107 --
 .../core/util/shell/commands/TraceCommand.java  |  101 --
 .../core/util/shell/commands/UserCommand.java   |   71 --
 .../shell/commands/UserPermissionsCommand.java  |  106 --
 .../core/util/shell/commands/UsersCommand.java  |   45 -
 .../core/util/shell/commands/WhoAmICommand.java |   41 -
 .../EmptySplitsAccumuloInputFormat.java         |   10 +-
 .../core/util/format/DeleterFormatterTest.java  |  176 ---
 .../core/util/shell/PasswordConverterTest.java  |  113 --
 .../core/util/shell/ShellConfigTest.java        |   90 --
 .../core/util/shell/ShellSetInstanceTest.java   |  242 ----
 .../accumulo/core/util/shell/ShellTest.java     |  281 -----
 .../accumulo/core/util/shell/ShellUtilTest.java |   66 -
 .../shell/command/FormatterCommandTest.java     |  184 ---
 core/src/test/resources/shelltest.txt           |   16 -
 .../chapters/administration.tex                 |   37 +
 examples/simple/pom.xml                         |    4 +
 .../examples/simple/shell/DebugCommand.java     |    4 +-
 .../simple/shell/MyAppShellExtension.java       |    4 +-
 fate/pom.xml                                    |    9 +
 .../org/apache/accumulo/fate/AdminUtil.java     |   14 +-
 .../java/org/apache/accumulo/fate/Fate.java     |    2 +-
 .../org/apache/accumulo/fate/ReadOnlyRepo.java  |   32 +
 .../org/apache/accumulo/fate/ReadOnlyStore.java |  111 ++
 .../apache/accumulo/fate/ReadOnlyTStore.java    |  125 ++
 .../java/org/apache/accumulo/fate/Repo.java     |    5 +-
 .../java/org/apache/accumulo/fate/TStore.java   |   78 +-
 .../apache/accumulo/fate/AgeOffStoreTest.java   |    2 +-
 .../apache/accumulo/fate/ReadOnlyStoreTest.java |   72 ++
 .../org/apache/accumulo/fate/SimpleStore.java   |    2 +-
 pom.xml                                         |    8 +-
 .../org/apache/accumulo/server/Accumulo.java    |   33 +-
 .../accumulo/server/util/MetadataTableUtil.java |    3 +
 server/gc/pom.xml                               |    5 +
 .../gc/GarbageCollectWriteAheadLogs.java        |   89 +-
 .../accumulo/gc/SimpleGarbageCollector.java     |  134 +-
 .../gc/GarbageCollectWriteAheadLogsTest.java    |  264 ++++
 .../gc/SimpleGarbageCollectorOptsTest.java      |   37 +
 .../accumulo/gc/SimpleGarbageCollectorTest.java |  146 +++
 .../accumulo/master/FateServiceHandler.java     |    2 +-
 .../java/org/apache/accumulo/master/Master.java |   77 +-
 .../apache/accumulo/master/util/FateAdmin.java  |   24 +-
 server/monitor/pom.xml                          |    4 +
 .../accumulo/monitor/servlets/ShellServlet.java |    2 +-
 .../monitor/servlets/trace/Summary.java         |   21 +-
 .../monitor/servlets/trace/SummaryTest.java     |   42 +
 shell/pom.xml                                   |  123 ++
 .../java/org/apache/accumulo/shell/Shell.java   | 1168 ++++++++++++++++++
 .../accumulo/shell/ShellCommandException.java   |   59 +
 .../apache/accumulo/shell/ShellCompletor.java   |  162 +++
 .../apache/accumulo/shell/ShellExtension.java   |   27 +
 .../org/apache/accumulo/shell/ShellOptions.java |   33 +
 .../apache/accumulo/shell/ShellOptionsJC.java   |  280 +++++
 .../org/apache/accumulo/shell/ShellUtil.java    |   60 +
 .../java/org/apache/accumulo/shell/Token.java   |  137 ++
 .../accumulo/shell/commands/AboutCommand.java   |   56 +
 .../commands/ActiveCompactionIterator.java      |  136 ++
 .../shell/commands/ActiveScanIterator.java      |   91 ++
 .../shell/commands/AddAuthsCommand.java         |   82 ++
 .../shell/commands/AddSplitsCommand.java        |   88 ++
 .../shell/commands/AuthenticateCommand.java     |   66 +
 .../accumulo/shell/commands/ByeCommand.java     |   19 +
 .../shell/commands/ClasspathCommand.java        |   55 +
 .../accumulo/shell/commands/ClearCommand.java   |   52 +
 .../shell/commands/CloneTableCommand.java       |  102 ++
 .../accumulo/shell/commands/ClsCommand.java     |   19 +
 .../accumulo/shell/commands/CompactCommand.java |  129 ++
 .../accumulo/shell/commands/ConfigCommand.java  |  315 +++++
 .../shell/commands/ConstraintCommand.java       |  134 ++
 .../shell/commands/CreateNamespaceCommand.java  |   99 ++
 .../shell/commands/CreateTableCommand.java      |  203 +++
 .../shell/commands/CreateUserCommand.java       |   76 ++
 .../accumulo/shell/commands/DUCommand.java      |  124 ++
 .../accumulo/shell/commands/DebugCommand.java   |   71 ++
 .../accumulo/shell/commands/DeleteCommand.java  |  112 ++
 .../shell/commands/DeleteIterCommand.java       |  114 ++
 .../shell/commands/DeleteManyCommand.java       |   82 ++
 .../shell/commands/DeleteNamespaceCommand.java  |  100 ++
 .../shell/commands/DeleteRowsCommand.java       |   65 +
 .../shell/commands/DeleteScanIterCommand.java   |  102 ++
 .../shell/commands/DeleteShellIterCommand.java  |  100 ++
 .../shell/commands/DeleteTableCommand.java      |   60 +
 .../shell/commands/DeleteUserCommand.java       |   19 +
 .../shell/commands/DropTableCommand.java        |   19 +
 .../shell/commands/DropUserCommand.java         |   61 +
 .../accumulo/shell/commands/EGrepCommand.java   |   59 +
 .../shell/commands/ExecfileCommand.java         |   67 +
 .../accumulo/shell/commands/ExitCommand.java    |   39 +
 .../shell/commands/ExportTableCommand.java      |   78 ++
 .../shell/commands/ExtensionCommand.java        |  102 ++
 .../accumulo/shell/commands/FateCommand.java    |  180 +++
 .../accumulo/shell/commands/FlushCommand.java   |   63 +
 .../shell/commands/FormatterCommand.java        |   69 ++
 .../shell/commands/GetAuthsCommand.java         |   67 +
 .../shell/commands/GetGroupsCommand.java        |   60 +
 .../shell/commands/GetSplitsCommand.java        |  155 +++
 .../accumulo/shell/commands/GrantCommand.java   |  133 ++
 .../accumulo/shell/commands/GrepCommand.java    |  111 ++
 .../accumulo/shell/commands/HelpCommand.java    |  129 ++
 .../accumulo/shell/commands/HiddenCommand.java  |   62 +
 .../accumulo/shell/commands/HistoryCommand.java |   82 ++
 .../shell/commands/ImportDirectoryCommand.java  |   58 +
 .../shell/commands/ImportTableCommand.java      |   51 +
 .../accumulo/shell/commands/InfoCommand.java    |   19 +
 .../accumulo/shell/commands/InsertCommand.java  |  148 +++
 .../shell/commands/InterpreterCommand.java      |   40 +
 .../shell/commands/ListCompactionsCommand.java  |   78 ++
 .../shell/commands/ListIterCommand.java         |  140 +++
 .../shell/commands/ListScansCommand.java        |   78 ++
 .../shell/commands/ListShellIterCommand.java    |  105 ++
 .../accumulo/shell/commands/MaxRowCommand.java  |   55 +
 .../accumulo/shell/commands/MergeCommand.java   |  111 ++
 .../commands/NamespacePermissionsCommand.java   |   44 +
 .../shell/commands/NamespacesCommand.java       |   83 ++
 .../accumulo/shell/commands/NoTableCommand.java |   40 +
 .../accumulo/shell/commands/OfflineCommand.java |   61 +
 .../accumulo/shell/commands/OnlineCommand.java  |   61 +
 .../apache/accumulo/shell/commands/OptUtil.java |  146 +++
 .../accumulo/shell/commands/PasswdCommand.java  |   96 ++
 .../accumulo/shell/commands/PingCommand.java    |   82 ++
 .../accumulo/shell/commands/PingIterator.java   |   58 +
 .../shell/commands/QuestionCommand.java         |   24 +
 .../accumulo/shell/commands/QuitCommand.java    |   19 +
 .../shell/commands/QuotedStringTokenizer.java   |  141 +++
 .../shell/commands/RenameNamespaceCommand.java  |   79 ++
 .../shell/commands/RenameTableCommand.java      |   62 +
 .../accumulo/shell/commands/RevokeCommand.java  |  133 ++
 .../accumulo/shell/commands/ScanCommand.java    |  334 +++++
 .../accumulo/shell/commands/ScriptCommand.java  |  290 +++++
 .../shell/commands/SetAuthsCommand.java         |   77 ++
 .../shell/commands/SetGroupsCommand.java        |   78 ++
 .../accumulo/shell/commands/SetIterCommand.java |  453 +++++++
 .../shell/commands/SetScanIterCommand.java      |  127 ++
 .../shell/commands/SetShellIterCommand.java     |  131 ++
 .../ShellPluginConfigurationCommand.java        |  146 +++
 .../accumulo/shell/commands/SleepCommand.java   |   46 +
 .../commands/SystemPermissionsCommand.java      |   44 +
 .../accumulo/shell/commands/TableCommand.java   |   60 +
 .../accumulo/shell/commands/TableOperation.java |  153 +++
 .../shell/commands/TablePermissionsCommand.java |   44 +
 .../accumulo/shell/commands/TablesCommand.java  |  107 ++
 .../accumulo/shell/commands/TraceCommand.java   |  101 ++
 .../accumulo/shell/commands/UserCommand.java    |   71 ++
 .../shell/commands/UserPermissionsCommand.java  |  106 ++
 .../accumulo/shell/commands/UsersCommand.java   |   45 +
 .../accumulo/shell/commands/WhoAmICommand.java  |   41 +
 .../accumulo/shell/format/DeleterFormatter.java |  102 ++
 .../apache/accumulo/shell/mock/MockShell.java   |  143 +++
 shell/src/main/resources/.gitignore             |    0
 .../accumulo/shell/PasswordConverterTest.java   |  113 ++
 .../apache/accumulo/shell/ShellConfigTest.java  |   91 ++
 .../accumulo/shell/ShellSetInstanceTest.java    |  244 ++++
 .../org/apache/accumulo/shell/ShellTest.java    |  282 +++++
 .../apache/accumulo/shell/ShellUtilTest.java    |   67 +
 .../shell/command/FormatterCommandTest.java     |  184 +++
 .../shell/format/DeleterFormatterTest.java      |  177 +++
 shell/src/test/resources/log4j.properties       |   28 +
 shell/src/test/resources/shelltest.txt          |   16 +
 .../java/org/apache/accumulo/start/Main.java    |    2 +-
 .../org/apache/accumulo/test/ShellServerIT.java |    2 +-
 276 files changed, 14442 insertions(+), 12242 deletions(-)
----------------------------------------------------------------------



Mime
View raw message