Branch: refs/heads/master Home: https://github.com/qos-ch/logback Commit: 56992e1d9ebb130b8fd912d12e553b765bee98b9 https://github.com/qos-ch/logback/commit/56992e1d9ebb130b8fd912d12e553b765be... Author: David Roussel <dave@dvae.net> Date: 2013-04-19 (Fri, 19 Apr 2013) Changed paths: M logback-core/src/main/java/ch/qos/logback/core/joran/action/TimestampAction.java Log Message: ----------- LOGBACK-835 - make timestamp properties default to local scope. Can be overriden by setting scope attribute Commit: 2ac2ea954058480bd62ccd715f5f8c078995efe4 https://github.com/qos-ch/logback/commit/2ac2ea954058480bd62ccd715f5f8c07899... Author: David Roussel <dave@dvae.net> Date: 2013-04-19 (Fri, 19 Apr 2013) Changed paths: M logback-classic/src/main/java/ch/qos/logback/classic/sift/AppenderFactory.java M logback-classic/src/main/java/ch/qos/logback/classic/sift/SiftAction.java M logback-classic/src/main/java/ch/qos/logback/classic/sift/SiftingJoranConfigurator.java A logback-classic/src/test/input/joran/timestamp-local.xml M logback-classic/src/test/input/joran/timestamp.xml M logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java M logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java M logback-core/src/main/java/ch/qos/logback/core/sift/AppenderFactoryBase.java M logback-core/src/main/java/ch/qos/logback/core/sift/SiftingAppenderBase.java M logback-core/src/main/java/ch/qos/logback/core/sift/SiftingJoranConfiguratorBase.java M logback-core/src/main/java/ch/qos/logback/core/spi/PropertyContainer.java Log Message: ----------- LOGBACK-833 - allow previously defined properties (in local scope) to be seen by SiftingJoranConfigurator * implemented part two of Ceki's suggestion * add getCopyOfPropertyMap() to the PropertyContainer and thus InterpretationContext * use local properties that are ineffect at time of creation of SiftingAppender to seed the properties map used when creting the child appenders and properties * removed some generics warnings * in AppenderFactoryBase use List.subList() rather than "copy whole array then delete and re-shuffle elements" Commit: e8a239415a5b2cbb249be046f5e09eb04085ed24 https://github.com/qos-ch/logback/commit/e8a239415a5b2cbb249be046f5e09eb0408... Author: David Roussel <dave@dvae.net> Date: 2013-04-19 (Fri, 19 Apr 2013) Changed paths: M logback-core/src/main/java/ch/qos/logback/core/joran/action/TimestampAction.java Log Message: ----------- LOGBACK-835 - corrected status message in timestamp Commit: af2b445fe6ce1378efe4812b92882c40135e7de0 https://github.com/qos-ch/logback/commit/af2b445fe6ce1378efe4812b92882c40135... Author: David Roussel <dave@dvae.net> Date: 2013-04-19 (Fri, 19 Apr 2013) Changed paths: M logback-classic/src/test/input/joran/timestamp-local.xml M logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java Log Message: ----------- LOGBACK-833 - unit test improvements to check that a local timestamp property really was set Commit: 7da92b548ffcd5edcda5051be488f9ac2d21abc4 https://github.com/qos-ch/logback/commit/7da92b548ffcd5edcda5051be488f9ac2d2... Author: Ceki Gulcu <ceki@qos.ch> Date: 2013-04-22 (Mon, 22 Apr 2013) Changed paths: M logback-classic/src/main/java/ch/qos/logback/classic/sift/AppenderFactory.java M logback-classic/src/main/java/ch/qos/logback/classic/sift/SiftAction.java M logback-classic/src/main/java/ch/qos/logback/classic/sift/SiftingJoranConfigurator.java A logback-classic/src/test/input/joran/timestamp-local.xml M logback-classic/src/test/input/joran/timestamp.xml M logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java M logback-core/src/main/java/ch/qos/logback/core/joran/action/TimestampAction.java M logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java M logback-core/src/main/java/ch/qos/logback/core/sift/AppenderFactoryBase.java M logback-core/src/main/java/ch/qos/logback/core/sift/SiftingAppenderBase.java M logback-core/src/main/java/ch/qos/logback/core/sift/SiftingJoranConfiguratorBase.java M logback-core/src/main/java/ch/qos/logback/core/spi/PropertyContainer.java Log Message: ----------- Merge pull request #111 from diroussel/LOGBACK-833-sift-variables LOGBACK-833 Fixes for variables in sifting appender Compare: https://github.com/qos-ch/logback/compare/3cc604f0eaf1...7da92b548ffc