Revert clirr to version 2.6.1. Add composite configuration documentation.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f7909e24 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f7909e24 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f7909e24 Branch: refs/heads/master Commit: f7909e240d11d8eef17d9cfc293eb50daa70b330 Parents: e975a89 Author: Ralph Goers <[email protected]> Authored: Mon Apr 25 18:15:36 2016 -0700 Committer: Ralph Goers <[email protected]> Committed: Mon Apr 25 18:15:36 2016 -0700 ---------------------------------------------------------------------- pom.xml | 2 +- src/site/site.xml | 1 + src/site/xdoc/manual/configuration.xml.vm | 46 +++++++++++++++++++++++--- 3 files changed, 44 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f7909e24/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ac79ff5..df4140d 100644 --- a/pom.xml +++ b/pom.xml @@ -210,7 +210,7 @@ <release.plugin.version>2.5.3</release.plugin.version> <scm.plugin.version>1.9.4</scm.plugin.version> <jxr.plugin.version>2.5</jxr.plugin.version> - <clirr.plugin.version>2.7</clirr.plugin.version> + <clirr.plugin.version>2.6.1</clirr.plugin.version> <site.plugin.version>3.4</site.plugin.version> <manifestfile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestfile> <maven.compile.source>1.7</maven.compile.source> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f7909e24/src/site/site.xml ---------------------------------------------------------------------- diff --git a/src/site/site.xml b/src/site/site.xml index b7f7a35..f9654e5 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -76,6 +76,7 @@ <item name="Lookup Variables" href="/manual/configuration.html#RuntimeLookup"/> <item name="Scripts" href="/manual/configuration.html#Scripts"/> <item name="XInclude" href="/manual/configuration.html#XInclude"/> + <item name="Composite Configurations" href="/manual/configuration.html#CompositeConfiguration"/> <item name="Status Messages" href="/manual/configuration.html#StatusMessages"/> <item name="Unit Testing in Maven" href="/manual/configuration.html#UnitTestingInMaven"/> <item name="System Properties" href="/manual/configuration.html#SystemProperties"/> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f7909e24/src/site/xdoc/manual/configuration.xml.vm ---------------------------------------------------------------------- diff --git a/src/site/xdoc/manual/configuration.xml.vm b/src/site/xdoc/manual/configuration.xml.vm index d0525c4..11e5c11 100644 --- a/src/site/xdoc/manual/configuration.xml.vm +++ b/src/site/xdoc/manual/configuration.xml.vm @@ -1238,6 +1238,32 @@ rootLogger.appenderRef.stdout.ref = STDOUT </loggers> ]]></pre> </subsection> + <a name="CompositeConfiguration"/> + <subsection name="Composite Configuration"> + <p> + Log4j allows multiple configuration files to be used by specifying them as a list of comma separated + file paths on log4j.configurationFile. When this is done Log4j will merge the files using the following rules. + <ol> + <li>The global configuration attributes are aggregated with those in later configurations replacing + those in previous configurations, with the exception that the highest status level and the lowest + monitorInterval greater than 0 will be used.</li> + <li>Properties from all configurations are aggregated. Duplicate properties replace those in previous + configurations.</li> + <li>Filters are aggregated under a CompositeFilter if more than one Filter is defined. Since Filters + are not named duplicates may be present.</li> + <li>Scripts and ScriptFile references are aggregated. Duplicate definiations replace those in previous + configurations.</li> + <li>Appenders are aggregated. Appenders with the same name are replaced by those in later + configurations, including all of the Appender's subcomponents.</li> + <li>Loggers are all aggregated. Logger attributes are individually merged with duplicates being + replaced by those in later configurations. Appender references on a Logger are aggregated with + duplicates being replaced by those in later configurations. Filters on a Logger are aggregated + under a CompositeFilter if more than one Filter is defined. Since Filters are not named + duplicates may be present. Filters under Appender references included or discarded depending on + whether their parent Appender reference is kept or discarded.</li> + </ol> + </p> + </subsection> <a name="StatusMessages"/> <subsection name="Status Messages"> <table> @@ -1499,12 +1525,15 @@ public class AwesomeTest { <a name="SystemProperties"/> <subsection name="System Properties"> <p> - Below follows a number of system properties that can be used to control Log4j 2 behaviour. + The Log4j documentation references a number of System Properties that can be used to control various aspects + of Log4j 2 behavior. The table below lists these properties along with their default value and a + description of what they control. Any spaces present in the property name are for visual flow and should be removed. </p> <p> - The below properties can also be specified by creating a file named - <tt>log4j2.component.properties</tt> and including this file in the classpath of the application. + The properties listed below can also be specified by creating a file named + <tt>log4j2.component.properties</tt>, adding the desired keys and value to the file, and then including + the file in the classpath of the application. </p> <table> <caption align="top">Log4j 2 System Properties</caption> @@ -1517,7 +1546,16 @@ public class AwesomeTest { <td>log4j.configurationFile</td> <td> </td> <td> - Path to an XML or JSON Log4j 2 configuration file. + Path to an XML or JSON Log4j 2 configuration file. May also contain a comma separated list of configuration + file names. + </td> + </tr> + <tr> + <td>log4j.mergeFactory</td> + <td> </td> + <td> + The name of the class that implements the MergeStrategy interface. If not specified + <code>DefaultMergeStrategy</code> will be used when creating a CompositeConfiguration.. </td> </tr> <tr>
