Repository: tez Updated Branches: refs/heads/master 86c690257 -> 9c562757c
TEZ-2765. Change Xmlwriter to use defaultValue instead of value tag. (hitesh) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/9c562757 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/9c562757 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/9c562757 Branch: refs/heads/master Commit: 9c562757cf151b45644e1d2e8c7f0d65b3acb416 Parents: 86c6902 Author: Hitesh Shah <[email protected]> Authored: Tue Sep 1 21:11:26 2015 -0700 Committer: Hitesh Shah <[email protected]> Committed: Tue Sep 1 21:11:26 2015 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../java/org/apache/tez/tools/javadoc/model/ConfigProperty.java | 1 + .../main/java/org/apache/tez/tools/javadoc/util/XmlWriter.java | 5 ++++- 3 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/9c562757/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index ffa9b37..833fabb 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -7,6 +7,7 @@ Release 0.8.1: Unreleased INCOMPATIBLE CHANGES ALL CHANGES: + TEZ-2765. Change Xmlwriter to use defaultValue instead of value tag. TEZ-2750. Shuffle may not shutdown in case of a fetch failure, causing it to hang. TEZ-2294. Add tez-site-template.xml with description of config properties. TEZ-2757. Fix download links for Tez releases. http://git-wip-us.apache.org/repos/asf/tez/blob/9c562757/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/model/ConfigProperty.java ---------------------------------------------------------------------- diff --git a/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/model/ConfigProperty.java b/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/model/ConfigProperty.java index 94c7e27..89490c4 100644 --- a/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/model/ConfigProperty.java +++ b/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/model/ConfigProperty.java @@ -37,6 +37,7 @@ public class ConfigProperty { + ", defaultValue=" + defaultValue + ", description=" + description + ", type=" + type + + ", inferredType=" + inferredType + ", private=" + isPrivate + ", validValues=" + (validValues == null ? "null" : validValues) + ", isConfigProp=" + isValidConfigProp; http://git-wip-us.apache.org/repos/asf/tez/blob/9c562757/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/util/XmlWriter.java ---------------------------------------------------------------------- diff --git a/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/util/XmlWriter.java b/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/util/XmlWriter.java index 248b36a..1c4b735 100644 --- a/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/util/XmlWriter.java +++ b/tez-tools/tez-javadoc-tools/src/main/java/org/apache/tez/tools/javadoc/util/XmlWriter.java @@ -51,6 +51,9 @@ public class XmlWriter extends Writer { out.println("<?xml version=\"1.0\"?>"); out.println("<?xml-stylesheet type=\"text/xsl\" href=\"configuration.xsl\"?>"); out.println(); + out.println("<!-- WARNING: THIS IS A GENERATED TEMPLATE PURELY FOR DOCUMENTATION PURPOSES"); + out.println(" AND SHOULD NOT BE USED AS A CONFIGURATION FILE FOR TEZ -->"); + out.println(); out.println("<configuration>"); for (ConfigProperty configProperty : config.configProperties.values()) { @@ -61,7 +64,7 @@ public class XmlWriter extends Writer { out.println(" <property>"); out.println(" <name>" + configProperty.propertyName + "</name>"); if (configProperty.defaultValue != null && !configProperty.defaultValue.isEmpty()) { - out.println(" <value>" + configProperty.defaultValue + "</value>"); + out.println(" <defaultValue>" + configProperty.defaultValue + "</defaultValue>"); } if (configProperty.description != null && !configProperty.description.isEmpty()) { out.println(" <description>" + StringEscapeUtils.escapeXml(configProperty.description)
