You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2015/10/13 09:31:10 UTC

[2/5] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e294d265
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e294d265
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e294d265

Branch: refs/heads/master
Commit: e294d26576e2c1da9b39300a56bf2ffb1c36a765
Parents: 57a213d d76fe4e
Author: ggregory <gg...@apache.org>
Authored: Tue Oct 13 00:17:32 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Oct 13 00:17:32 2015 -0700

----------------------------------------------------------------------
 log4j-core/pom.xml                              |  12 +
 .../core/config/AbstractConfiguration.java      |  49 +++-
 .../log4j/core/config/Configuration.java        |   3 +
 .../log4j/core/config/ScriptsPlugin.java        |  43 ++++
 .../builder/api/ConfigurationBuilder.java       |  50 ++++
 .../builder/api/ScriptComponentBuilder.java     |  25 ++
 .../builder/api/ScriptFileComponentBuilder.java |  32 +++
 .../core/config/builder/api/package-info.java   |  20 ++
 .../config/builder/impl/BuiltConfiguration.java |  16 +-
 .../impl/DefaultConfigurationBuilder.java       |  37 +++
 .../impl/DefaultScriptComponentBuilder.java     |  38 +++
 .../impl/DefaultScriptFileComponentBuilder.java |  57 +++++
 .../core/config/builder/impl/package-info.java  |  20 ++
 .../core/config/json/JsonConfiguration.java     |   7 +-
 .../core/config/plugins/PluginFactory.java      |   3 +
 .../PropertiesConfigurationFactory.java         |  57 +++++
 .../core/config/properties/package-info.java    |  20 ++
 .../log4j/core/config/xml/XmlConfiguration.java |   7 +-
 .../logging/log4j/core/filter/ScriptFilter.java | 155 ++++++++++++
 .../core/layout/ScriptPatternSelector.java      | 144 +++++++++++
 .../log4j/core/script/AbstractScript.java       |  31 +++
 .../logging/log4j/core/script/Script.java       |  46 ++++
 .../logging/log4j/core/script/ScriptFile.java   | 128 ++++++++++
 .../log4j/core/script/ScriptManager.java        | 236 +++++++++++++++++++
 .../logging/log4j/core/script/ScriptRef.java    |  58 +++++
 .../logging/log4j/core/script/package-info.java |  20 ++
 .../core/util/ExtensionLanguageMapping.java     |  71 ++++++
 .../logging/log4j/core/util/FileUtils.java      |  12 +
 .../logging/log4j/core/util/FileWatcher.java    |  27 +++
 .../apache/logging/log4j/core/util/IOUtils.java | 114 +++++++++
 .../log4j/core/util/StringBuilderWriter.java    | 164 +++++++++++++
 .../logging/log4j/core/util/WatchManager.java   |  98 ++++++++
 .../logging/log4j/core/PatternSelectorTest.java |  58 ++++-
 .../log4j/core/config/TestConfigurator.java     |  39 +++
 .../builder/CustomConfigurationFactory.java     |   1 +
 .../core/filter/AbstractScriptFilterTest.java   |  76 ++++++
 .../filter/ScriptFileFilterPropertiesTest.java  |  37 +++
 .../log4j/core/filter/ScriptFileFilterTest.java |  37 +++
 .../log4j/core/filter/ScriptFilterTest.java     |  37 +++
 .../log4j/core/filter/ScriptRefFilterTest.java  |  37 +++
 .../log4j/core/layout/PatternLayoutTest.java    |  30 +++
 .../log4j/core/util/WatchManagerTest.java       |  87 +++++++
 .../test/resources/log4j-patternSelector.xml    |  49 +++-
 .../src/test/resources/log4j-script-filters.xml |  60 +++++
 .../log4j-scriptFile-filters.properties         |  63 +++++
 .../test/resources/log4j-scriptFile-filters.xml |  43 ++++
 .../test/resources/log4j-scriptRef-filters.xml  |  47 ++++
 .../src/test/resources/scripts/filter.groovy    |   6 +
 log4j-core/src/test/resources/scripts/filter.js |   7 +
 src/site/site.xml                               |   2 +
 src/site/xdoc/manual/configuration.xml.vm       | 134 +++++++++++
 src/site/xdoc/manual/filters.xml                | 123 ++++++++++
 src/site/xdoc/manual/layouts.xml.vm             |  57 ++++-
 53 files changed, 2813 insertions(+), 17 deletions(-)
----------------------------------------------------------------------