Remove TODO for CustomLevel in ConfigurationBuilder
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/244b79b3 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/244b79b3 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/244b79b3 Branch: refs/heads/LOG4J2-1528 Commit: 244b79b36623b6a61cdb5c1d5715bd2b32083290 Parents: 7ab63d4 Author: Mikael Ståldal <mik...@staldal.nu> Authored: Sun Aug 21 19:17:25 2016 +0200 Committer: Mikael Ståldal <mik...@staldal.nu> Committed: Sun Aug 21 19:17:25 2016 +0200 ---------------------------------------------------------------------- .../apache/logging/log4j/core/config/AbstractConfiguration.java | 2 +- .../core/config/builder/impl/DefaultConfigurationBuilder.java | 2 +- .../log4j/core/config/builder/ConfigurationBuilderTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/244b79b3/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java index b098334..68f88d1 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java @@ -253,7 +253,7 @@ public abstract class AbstractConfiguration extends AbstractFilterable implement writeXmlSection(xmlWriter, lookupSection("Properties")); writeXmlSection(xmlWriter, lookupSection("Scripts")); - writeXmlSection(xmlWriter, lookupSection("CustomLevels")); // TODO customLevel level vs intLevel + writeXmlSection(xmlWriter, lookupSection("CustomLevels")); Node filters = lookupSection("Filters"); if (filters != null) { writeXmlSection(xmlWriter, filters); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/244b79b3/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java index 849a9f4..139d721 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java @@ -257,7 +257,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement writeXmlSection(xmlWriter, properties); writeXmlSection(xmlWriter, scripts); - writeXmlSection(xmlWriter, customLevels); // TODO customLevel level vs intLevel + writeXmlSection(xmlWriter, customLevels); if (filters.getComponents().size() == 1) { writeXmlComponent(xmlWriter, filters.getComponents().get(0), 1); } else if (filters.getComponents().size() > 1) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/244b79b3/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java index 15b9599..c975e01 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java @@ -62,7 +62,7 @@ public class ConfigurationBuilderTest { "\t\t<ScriptFile path=\"target/test-classes/scripts/filter.groovy\" name=\"target/test-classes/scripts/filter.groovy\" isWatched=\"true\"/>" + System.lineSeparator() + "\t</Scripts>" + System.lineSeparator() + "\t<CustomLevels>" + System.lineSeparator() + - "\t\t<CustomLevel intLevel=\"17\" name=\"Panic\"/>" + System.lineSeparator() + + "\t\t<CustomLevel name=\"Panic\" intLevel=\"17\"/>" + System.lineSeparator() + "\t</CustomLevels>" + System.lineSeparator() + "\t<ThresholdFilter onMatch=\"ACCEPT\" level=\"DEBUG\" onMisMatch=\"NEUTRAL\"/>" + System.lineSeparator() + "\t<Appenders>" + System.lineSeparator() +
