Branch: refs/heads/receiverTracking 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: 9acdc4a0d9c584e7f908c92b4736a8b66654d429 https://github.com/qos-ch/logback/commit/9acdc4a0d9c584e7f908c92b4736a8b6665... Author: Ceki Gulcu <ceki@qos.ch> Date: 2013-04-22 (Mon, 22 Apr 2013) Changed paths: M logback-core/src/main/java/ch/qos/logback/core/ContextBase.java Log Message: ----------- modify ThreadPoolExecutor as discussed in https://github.com/qos-ch/logback/commit/00abc35c Commit: a418a48cf4218b6feb162934116a13c5aab91c69 https://github.com/qos-ch/logback/commit/a418a48cf4218b6feb162934116a13c5aab... Author: Ceki Gulcu <ceki@qos.ch> Date: 2013-04-22 (Mon, 22 Apr 2013) Changed paths: M logback-examples/src/main/java/chapters/receivers/socket/AppenderExample.java M logback-examples/src/main/java/chapters/receivers/socket/ReceiverExample.java M logback-site/src/site/pages/manual/receivers.html Log Message: ----------- add or correct links to examples Commit: 5f43720d25920517fd310bf8944702717263bf5d https://github.com/qos-ch/logback/commit/5f43720d25920517fd310bf894470271726... Author: Ceki Gulcu <ceki@qos.ch> Date: 2013-04-22 (Mon, 22 Apr 2013) Changed paths: M logback-core/src/main/java/ch/qos/logback/core/util/ContextUtil.java M logback-site/src/site/pages/news.html Log Message: ----------- added blurb about LOGBACK-749 Commit: 4b770ce0deca90b684322abfa02c99fb0255ee61 https://github.com/qos-ch/logback/commit/4b770ce0deca90b684322abfa02c99fb025... Author: Ceki Gulcu <ceki@qos.ch> Date: 2013-04-22 (Mon, 22 Apr 2013) Changed paths: M logback-site/src/site/pages/volunteer.html Log Message: ----------- added reference to logback-decoder project Commit: 3cc604f0eaf100a313b303c7a688447052ce9f90 https://github.com/qos-ch/logback/commit/3cc604f0eaf100a313b303c7a688447052c... Author: Ceki Gulcu <ceki@qos.ch> Date: 2013-04-22 (Mon, 22 Apr 2013) Changed paths: M logback-site/src/site/pages/volunteer.html Log Message: ----------- native speaker requirement for the logback 10 minutes document 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 Commit: 993070fc4ab148cd7b69680d584bd62aa76a7881 https://github.com/qos-ch/logback/commit/993070fc4ab148cd7b69680d584bd62aa76... Author: Ceki Gulcu <ceki@qos.ch> Date: 2013-04-23 (Tue, 23 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/SiftingJoranConfigurator.java M logback-classic/src/test/input/joran/sift/defaultLayoutRule.xml A logback-classic/src/test/input/joran/sift/propertyPropagation.xml A logback-classic/src/test/input/joran/timestamp-context.xml R logback-classic/src/test/input/joran/timestamp.xml M logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java M logback-classic/src/test/java/ch/qos/logback/classic/sift/SiftingAppenderTest.java M logback-core/src/main/java/ch/qos/logback/core/joran/action/ActionUtil.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/sift/AppenderFactoryBase.java M logback-site/src/site/pages/news.html Log Message: ----------- added test for property propagation in siftingAppender, minor variable name changes Commit: a1b5d4b974b9feb0c4fb6b57b5e24ea5baee9bb1 https://github.com/qos-ch/logback/commit/a1b5d4b974b9feb0c4fb6b57b5e24ea5bae... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-23 (Tue, 23 Apr 2013) Changed paths: R logback-classic/src/test/java/ch/qos/logback/classic/net/server/MockThreadPoolFactoryBean.java R logback-core/src/main/java/ch/qos/logback/core/net/server/ThreadPoolFactoryBean.java R logback-core/src/test/java/ch/qos/logback/core/net/server/MockThreadPoolFactoryBean.java R logback-core/src/test/java/ch/qos/logback/core/net/server/ThreadPoolFactoryBeanTest.java Log Message: ----------- removed ThreadPoolFactoryBean and related classes Commit: 9246486dce45e3f2fe4d2714c732ec3a349196d8 https://github.com/qos-ch/logback/commit/9246486dce45e3f2fe4d2714c732ec3a349... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-23 (Tue, 23 Apr 2013) Changed paths: A logback-core/src/test/java/ch/qos/logback/core/net/server/MockExecutorService.java Log Message: ----------- added MockExecutorService to support unit tests Commit: 85afb53026a75492ce770de7cfd89a879bae2b7e https://github.com/qos-ch/logback/commit/85afb53026a75492ce770de7cfd89a879ba... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-23 (Tue, 23 Apr 2013) Changed paths: M logback-classic/src/main/java/ch/qos/logback/classic/net/server/SocketServerNestedComponentRegistryRules.java Log Message: ----------- removed ThreadPoolFactoryBean from nested component rules Commit: 72c454e204acae16ac95560b3720da0bb2fbc2c1 https://github.com/qos-ch/logback/commit/72c454e204acae16ac95560b3720da0bb2f... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-23 (Tue, 23 Apr 2013) Changed paths: M logback-core/src/main/java/ch/qos/logback/core/net/server/ServerSocketAppenderBase.java M logback-core/src/test/java/ch/qos/logback/core/net/server/MockContext.java M logback-core/src/test/java/ch/qos/logback/core/net/server/ServerSocketAppenderBaseFunctionalTest.java M logback-core/src/test/java/ch/qos/logback/core/net/server/ServerSocketAppenderBaseTest.java Log Message: ----------- ServerSocketAppenderBase now uses context executor service Commit: faed1d2c94388ae5264aa352b6e3b2b18632bf1f https://github.com/qos-ch/logback/commit/faed1d2c94388ae5264aa352b6e3b2b1863... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-23 (Tue, 23 Apr 2013) Changed paths: M logback-classic/src/main/java/ch/qos/logback/classic/net/ReceiverBase.java M logback-classic/src/main/java/ch/qos/logback/classic/net/SocketReceiver.java M logback-classic/src/main/java/ch/qos/logback/classic/net/server/ServerSocketReceiver.java M logback-classic/src/test/java/ch/qos/logback/classic/net/server/ServerSocketReceiverFunctionalTest.java M logback-classic/src/test/java/ch/qos/logback/classic/net/server/ServerSocketReceiverTest.java Log Message: ----------- receivers now use context executorService Commit: ef719d8eedfdfe4b842387648d85fb85c0267bb9 https://github.com/qos-ch/logback/commit/ef719d8eedfdfe4b842387648d85fb85c02... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-23 (Tue, 23 Apr 2013) Changed paths: M logback-site/src/site/pages/manual/appenders.html M logback-site/src/site/pages/manual/receivers.html Log Message: ----------- removed references to thread pool configuration Commit: 4a7c5ad5896bb352b862f166334944393262e37a https://github.com/qos-ch/logback/commit/4a7c5ad5896bb352b862f16633494439326... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-23 (Tue, 23 Apr 2013) Changed paths: M logback-classic/src/main/java/ch/qos/logback/classic/net/ReceiverBase.java Log Message: ----------- don't stop executorService in ReceiverBase Commit: 6218bf8b018cd468af57e6ae620f72442d3b7738 https://github.com/qos-ch/logback/commit/6218bf8b018cd468af57e6ae620f72442d3... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-23 (Tue, 23 Apr 2013) Changed paths: M logback-classic/src/test/java/ch/qos/logback/classic/net/SocketReceiverTest.java Log Message: ----------- reworked SocketReceiverTest to use context executor service Commit: 902d4bbfe70c5c0f27cd0ad8392e33a4e64ace78 https://github.com/qos-ch/logback/commit/902d4bbfe70c5c0f27cd0ad8392e33a4e64... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-23 (Tue, 23 Apr 2013) Changed paths: M logback-classic/src/test/java/ch/qos/logback/classic/net/server/ServerSocketReceiverFunctionalTest.java Log Message: ----------- no need to use slf4j in ServerSocketReceiverFunctionalTest Commit: 3193a3753bfee0a5e26188907b63d544461159a0 https://github.com/qos-ch/logback/commit/3193a3753bfee0a5e26188907b63d544461... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-23 (Tue, 23 Apr 2013) Changed paths: M logback-classic/src/main/java/ch/qos/logback/classic/net/ReceiverBase.java M logback-classic/src/main/java/ch/qos/logback/classic/net/SocketReceiver.java M logback-classic/src/main/java/ch/qos/logback/classic/net/server/ServerSocketReceiver.java M logback-classic/src/main/java/ch/qos/logback/classic/net/server/SocketServerNestedComponentRegistryRules.java M logback-classic/src/test/java/ch/qos/logback/classic/net/SocketReceiverTest.java R logback-classic/src/test/java/ch/qos/logback/classic/net/server/MockThreadPoolFactoryBean.java M logback-classic/src/test/java/ch/qos/logback/classic/net/server/ServerSocketReceiverFunctionalTest.java M logback-classic/src/test/java/ch/qos/logback/classic/net/server/ServerSocketReceiverTest.java M logback-core/src/main/java/ch/qos/logback/core/net/server/ServerSocketAppenderBase.java R logback-core/src/main/java/ch/qos/logback/core/net/server/ThreadPoolFactoryBean.java M logback-core/src/test/java/ch/qos/logback/core/net/server/MockContext.java A logback-core/src/test/java/ch/qos/logback/core/net/server/MockExecutorService.java R logback-core/src/test/java/ch/qos/logback/core/net/server/MockThreadPoolFactoryBean.java M logback-core/src/test/java/ch/qos/logback/core/net/server/ServerSocketAppenderBaseFunctionalTest.java M logback-core/src/test/java/ch/qos/logback/core/net/server/ServerSocketAppenderBaseTest.java R logback-core/src/test/java/ch/qos/logback/core/net/server/ThreadPoolFactoryBeanTest.java M logback-site/src/site/pages/manual/appenders.html M logback-site/src/site/pages/manual/receivers.html Log Message: ----------- Merge branch 'useContextExecutorService2' Commit: 9b61cd54eb60e7c173a1cb2f4bedc34726511336 https://github.com/qos-ch/logback/commit/9b61cd54eb60e7c173a1cb2f4bedc347265... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-23 (Tue, 23 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/SiftingJoranConfigurator.java M logback-classic/src/test/input/joran/sift/defaultLayoutRule.xml A logback-classic/src/test/input/joran/sift/propertyPropagation.xml A logback-classic/src/test/input/joran/timestamp-context.xml R logback-classic/src/test/input/joran/timestamp.xml M logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java M logback-classic/src/test/java/ch/qos/logback/classic/sift/SiftingAppenderTest.java M logback-core/src/main/java/ch/qos/logback/core/joran/action/ActionUtil.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/sift/AppenderFactoryBase.java M logback-site/src/site/pages/news.html Log Message: ----------- Merge branch 'master' of github.com:qos-ch/logback Commit: 720638d9377e620cb70ef178fa1e7fb3eced7059 https://github.com/qos-ch/logback/commit/720638d9377e620cb70ef178fa1e7fb3ece... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-23 (Tue, 23 Apr 2013) Changed paths: M logback-access/src/main/java/ch/qos/logback/access/joran/JoranConfigurator.java R logback-classic/src/main/java/ch/qos/logback/classic/net/server/SocketServerNestedComponentRegistryRules.java M logback-classic/src/main/java/ch/qos/logback/classic/util/DefaultNestedComponentRules.java M logback-core/src/main/java/ch/qos/logback/core/net/ssl/SSLNestedComponentRegistryRules.java Log Message: ----------- clean up nested component rules for SSL Compare: https://github.com/qos-ch/logback/compare/877cd3606154...720638d9377e