Merge branch '1.6.0-SNAPSHOT'
Conflicts:
core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5655a044
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5655a044
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5655a044
Branch: refs/heads/master
Commit: 5655a044e027ed44131de943e2419c3a3289ffce
Parents: 0721f8d a20e19f
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Thu Mar 27 20:48:02 2014 -0400
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Thu Mar 27 20:48:02 2014 -0400
----------------------------------------------------------------------
assemble/src/main/assemblies/component.xml | 17 +-
.../core/conf/DefaultConfiguration.java | 13 +-
docs/pom.xml | 21 ++
.../chapters/administration.tex | 2 +-
.../chapters/table_configuration.tex | 4 +-
docs/src/main/resources/administration.html | 171 +++++++++++++++
docs/src/main/resources/bulkIngest.html | 114 ++++++++++
docs/src/main/resources/combiners.html | 87 ++++++++
docs/src/main/resources/constraints.html | 50 +++++
docs/src/main/resources/distributedTracing.html | 99 +++++++++
docs/src/main/resources/documentation.css | 112 ++++++++++
docs/src/main/resources/examples/README | 95 ++++++++
docs/src/main/resources/examples/README.batch | 55 +++++
docs/src/main/resources/examples/README.bloom | 219 +++++++++++++++++++
.../main/resources/examples/README.bulkIngest | 33 +++
.../main/resources/examples/README.classpath | 68 ++++++
docs/src/main/resources/examples/README.client | 79 +++++++
.../src/main/resources/examples/README.combiner | 70 ++++++
.../main/resources/examples/README.constraints | 54 +++++
docs/src/main/resources/examples/README.dirlist | 114 ++++++++++
docs/src/main/resources/examples/README.export | 91 ++++++++
.../src/main/resources/examples/README.filedata | 47 ++++
docs/src/main/resources/examples/README.filter | 110 ++++++++++
.../main/resources/examples/README.helloworld | 47 ++++
.../main/resources/examples/README.isolation | 50 +++++
docs/src/main/resources/examples/README.mapred | 154 +++++++++++++
.../main/resources/examples/README.maxmutation | 47 ++++
docs/src/main/resources/examples/README.regex | 58 +++++
.../main/resources/examples/README.reservations | 66 ++++++
docs/src/main/resources/examples/README.rowhash | 59 +++++
docs/src/main/resources/examples/README.shard | 67 ++++++
.../main/resources/examples/README.tabletofile | 59 +++++
.../src/main/resources/examples/README.terasort | 50 +++++
.../main/resources/examples/README.visibility | 131 +++++++++++
docs/src/main/resources/index.html | 40 ++++
docs/src/main/resources/isolation.html | 51 +++++
docs/src/main/resources/lgroups.html | 45 ++++
docs/src/main/resources/metrics.html | 182 +++++++++++++++
docs/src/main/resources/timestamps.html | 160 ++++++++++++++
pom.xml | 4 +-
.../accumulo/monitor/servlets/BasicServlet.java | 4 +-
.../monitor/servlets/DefaultServlet.java | 26 +--
.../src/main/resources/docs/administration.html | 171 ---------------
.../src/main/resources/docs/bulkIngest.html | 114 ----------
.../src/main/resources/docs/combiners.html | 85 -------
.../src/main/resources/docs/constraints.html | 49 -----
.../main/resources/docs/distributedTracing.html | 99 ---------
.../src/main/resources/docs/documentation.css | 112 ----------
.../src/main/resources/docs/examples/README | 95 --------
.../main/resources/docs/examples/README.batch | 55 -----
.../main/resources/docs/examples/README.bloom | 219 -------------------
.../resources/docs/examples/README.bulkIngest | 33 ---
.../resources/docs/examples/README.classpath | 68 ------
.../main/resources/docs/examples/README.client | 79 -------
.../resources/docs/examples/README.combiner | 70 ------
.../resources/docs/examples/README.constraints | 54 -----
.../main/resources/docs/examples/README.dirlist | 114 ----------
.../main/resources/docs/examples/README.export | 91 --------
.../resources/docs/examples/README.filedata | 47 ----
.../main/resources/docs/examples/README.filter | 110 ----------
.../resources/docs/examples/README.helloworld | 47 ----
.../resources/docs/examples/README.isolation | 50 -----
.../main/resources/docs/examples/README.mapred | 154 -------------
.../resources/docs/examples/README.maxmutation | 47 ----
.../main/resources/docs/examples/README.regex | 58 -----
.../resources/docs/examples/README.reservations | 66 ------
.../main/resources/docs/examples/README.rowhash | 59 -----
.../main/resources/docs/examples/README.shard | 67 ------
.../resources/docs/examples/README.tabletofile | 59 -----
.../resources/docs/examples/README.terasort | 50 -----
.../resources/docs/examples/README.visibility | 131 -----------
.../monitor/src/main/resources/docs/index.html | 41 ----
.../src/main/resources/docs/isolation.html | 39 ----
.../src/main/resources/docs/lgroups.html | 42 ----
.../src/main/resources/docs/metrics.html | 182 ---------------
.../src/main/resources/docs/timestamps.html | 160 --------------
76 files changed, 2982 insertions(+), 2960 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5655a044/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
----------------------------------------------------------------------
diff --cc
core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
index 843d126,847fd02..607300c
--- a/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
@@@ -70,24 -60,11 +70,15 @@@ public class DefaultConfiguration exten
props.put(entry.getKey(), entry.getValue());
}
- /**
- * Generates HTML documentation on the default configuration. Used by the
monitor to show configuration properties.
- *
- * @param doc stream to write HTML to
- */
- protected static void generateDocumentation(PrintStream doc) {
- new ConfigurationDocGen(doc).generateHtml();
- }
-
/*
- * Generate documentation for conf/accumulo-site.xml file usage
+ * Generates documentation for conf/accumulo-site.xml file usage. Arguments
+ * are: "--generate-doc", file to write to.
+ *
+ * @param args command-line arguments
+ * @throws IllegalArgumentException if args is invalid
*/
public static void main(String[] args) throws FileNotFoundException,
UnsupportedEncodingException {
- if (args.length == 2 && args[0].equals("--generate-doc")) {
+ if (args.length == 2 && args[0].equals("--generate-html")) {
new ConfigurationDocGen(new PrintStream(args[1],
Constants.UTF8.name())).generateHtml();
} else if (args.length == 2 && args[0].equals("--generate-latex")) {
new ConfigurationDocGen(new PrintStream(args[1],
Constants.UTF8.name())).generateLaTeX();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5655a044/docs/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5655a044/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5655a044/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/BasicServlet.java
----------------------------------------------------------------------
