Merge remote-tracking branch 'origin/master' into LOG4J2-1539 Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d18e9c95 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d18e9c95 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d18e9c95
Branch: refs/heads/LOG4J2-1528 Commit: d18e9c951723fe1908f4a9d3c8078ddb18d0ef03 Parents: 3f92f7c 30ea283 Author: Gary Gregory <ggreg...@apache.org> Authored: Tue Aug 23 21:13:34 2016 -0700 Committer: Gary Gregory <ggreg...@apache.org> Committed: Tue Aug 23 21:13:34 2016 -0700 ---------------------------------------------------------------------- .../logging/log4j/core/LoggerContext.java | 26 ++++++++----- .../log4j/core/appender/FileAppender.java | 4 +- .../core/appender/RollingFileAppender.java | 4 +- .../core/config/AbstractConfiguration.java | 27 ++++++------- .../log4j/core/config/AppenderControl.java | 3 +- .../logging/log4j/core/config/LoggerConfig.java | 36 +----------------- .../config/plugins/PluginBuilderFactory.java | 1 + .../config/plugins/PluginConfiguration.java | 1 + .../core/config/plugins/PluginFactory.java | 2 +- .../log4j/core/config/plugins/PluginNode.java | 1 + .../core/config/plugins/util/PluginBuilder.java | 2 - .../config/plugins/util/PluginRegistry.java | 1 - .../core/config/plugins/util/ResolverUtil.java | 8 +++- .../log4j/core/config/xml/XmlConfiguration.java | 40 ++++++++++---------- .../apache/logging/log4j/core/jmx/Server.java | 8 +++- .../log4j/core/script/ScriptManager.java | 1 - .../apache/logging/log4j/core/util/Assert.java | 38 ------------------- .../logging/log4j/core/util/Constants.java | 11 ------ .../core/appender/OutputStreamAppenderTest.java | 2 +- .../rolling/RollingFileAppenderAccessTest.java | 2 +- .../config/plugins/util/ResolverUtilTest.java | 20 ++++++++++ .../org/apache/logging/log4j/web/WebLookup.java | 8 ---- src/changes/changes.xml | 30 +++++++++++++++ 23 files changed, 126 insertions(+), 150 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d18e9c95/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d18e9c95/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java ----------------------------------------------------------------------