Branch: refs/heads/LOGBACK-848 Home: https://github.com/qos-ch/logback Commit: ba8cd266cc3ca6d4d93024635f35fe614ce80d64 https://github.com/qos-ch/logback/commit/ba8cd266cc3ca6d4d93024635f35fe614ce... Author: Ceki Gulcu <ceki@qos.ch> Date: 2013-04-29 (Mon, 29 Apr 2013) Changed paths: M logback-access/src/main/java/ch/qos/logback/access/joran/JoranConfigurator.java M logback-access/src/main/java/ch/qos/logback/access/sift/SiftingJoranConfigurator.java M logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java M logback-classic/src/main/java/ch/qos/logback/classic/sift/SiftingJoranConfigurator.java M logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java M logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java M logback-core/src/main/java/ch/qos/logback/core/joran/action/Action.java M logback-core/src/main/java/ch/qos/logback/core/joran/action/ImplicitAction.java M logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedBasicPropertyIA.java M logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedComplexPropertyIA.java M logback-core/src/main/java/ch/qos/logback/core/joran/action/NewRuleAction.java M logback-core/src/main/java/ch/qos/logback/core/joran/event/SaxEventRecorder.java M logback-core/src/main/java/ch/qos/logback/core/joran/event/StartEvent.java A logback-core/src/main/java/ch/qos/logback/core/joran/spi/ElementSelector.java M logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java R logback-core/src/main/java/ch/qos/logback/core/joran/spi/Pattern.java M logback-core/src/main/java/ch/qos/logback/core/joran/spi/RuleStore.java M logback-core/src/main/java/ch/qos/logback/core/joran/spi/SimpleRuleStore.java M logback-core/src/main/java/ch/qos/logback/core/sift/SiftingJoranConfiguratorBase.java M logback-core/src/test/java/ch/qos/logback/core/joran/SimpleConfigurator.java M logback-core/src/test/java/ch/qos/logback/core/joran/SkippingInInterpreterTest.java M logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfigurator.java M logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfiguratorTest.java M logback-core/src/test/java/ch/qos/logback/core/joran/action/DefinePropertyActionTest.java M logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java M logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseAndIncludeCompositionTest.java M logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseTest.java M logback-core/src/test/java/ch/qos/logback/core/joran/event/InPlayFireTest.java M logback-core/src/test/java/ch/qos/logback/core/joran/implicitAction/ImplicitActionTest.java M logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitConfigurationTest.java M logback-core/src/test/java/ch/qos/logback/core/joran/replay/FruitConfigurator.java A logback-core/src/test/java/ch/qos/logback/core/joran/spi/ElementSelectorTest.java M logback-core/src/test/java/ch/qos/logback/core/joran/spi/PackageTest.java R logback-core/src/test/java/ch/qos/logback/core/joran/spi/PatternTest.java M logback-core/src/test/java/ch/qos/logback/core/joran/spi/SimpleRuleStoreTest.java M logback-examples/src/main/java/chapters/onJoran/SimpleConfigurator.java M logback-examples/src/main/java/chapters/onJoran/calculator/Calculator1.java M logback-examples/src/main/java/chapters/onJoran/calculator/Calculator2.java M logback-examples/src/main/java/chapters/onJoran/helloWorld/HelloWorld.java M logback-examples/src/main/java/chapters/onJoran/implicit/PrintMe.java M logback-examples/src/main/java/chapters/onJoran/implicit/PrintMeImplicitAction.java M logback-examples/src/main/java/chapters/onJoran/newRule/NewRuleCalculator.java Log Message: ----------- joran.spi.Pattern split into spi.ElementPath and spi.ElementSelector Commit: fb956c4c312784f10f5fd8bcb356b9e554a618ce https://github.com/qos-ch/logback/commit/fb956c4c312784f10f5fd8bcb356b9e554a... Author: Ceki Gulcu <ceki@qos.ch> Date: 2013-04-29 (Mon, 29 Apr 2013) Changed paths: M logback-access/src/main/java/ch/qos/logback/access/sift/SiftingJoranConfigurator.java M logback-classic/src/main/java/ch/qos/logback/classic/sift/SiftingJoranConfigurator.java M logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java M logback-core/src/main/java/ch/qos/logback/core/joran/event/SaxEventRecorder.java M logback-core/src/main/java/ch/qos/logback/core/joran/spi/ElementSelector.java M logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java M logback-core/src/main/java/ch/qos/logback/core/joran/spi/RuleStore.java M logback-core/src/main/java/ch/qos/logback/core/joran/spi/SimpleRuleStore.java M logback-core/src/test/java/ch/qos/logback/core/joran/spi/ElementSelectorTest.java M logback-core/src/test/java/ch/qos/logback/core/joran/spi/SimpleRuleStoreTest.java M logback-examples/src/main/java/chapters/onJoran/SimpleConfigurator.java Log Message: ----------- stricter separation between ElementPath and ElementSelector usage Commit: e2b09c5f6813466744dbe065838787618c0fffe9 https://github.com/qos-ch/logback/commit/e2b09c5f6813466744dbe065838787618c0... Author: Ceki Gulcu <ceki@qos.ch> Date: 2013-04-29 (Mon, 29 Apr 2013) Changed paths: M logback-core/src/main/java/ch/qos/logback/core/joran/spi/ElementSelector.java Log Message: ----------- all tests pass Commit: 4ea632b2873d249914bfc24b4d3d4c3703dcefc7 https://github.com/qos-ch/logback/commit/4ea632b2873d249914bfc24b4d3d4c3703d... Author: Ceki Gulcu <ceki@qos.ch> Date: 2013-04-29 (Mon, 29 Apr 2013) Changed paths: A logback-core/src/main/java/ch/qos/logback/core/joran/spi/ElementPath.java Log Message: ----------- add missing class Commit: 9f56a042967acaf39ae0db1fbe0d3b0f3a2abf65 https://github.com/qos-ch/logback/commit/9f56a042967acaf39ae0db1fbe0d3b0f3a2... Author: Christian Brensing <christian.brensing@lfstad.bayern.de> Date: 2013-04-30 (Tue, 30 Apr 2013) Changed paths: M logback-access/pom.xml Log Message: ----------- LOGBACK-300: Added Import-Package for core.rolling and core.rolling.helper. Imports of Jetty and Tomcat packages are optional as you normally can not satisify both (typically there is either Tomcat or Jetty present as OSGi web container). Commit: e855930330337bd362b5c7dd8bb26b84c9f2f0a8 https://github.com/qos-ch/logback/commit/e855930330337bd362b5c7dd8bb26b84c9f... Author: Ceki Gulcu <ceki@qos.ch> Date: 2013-04-30 (Tue, 30 Apr 2013) Changed paths: M logback-access/pom.xml Log Message: ----------- Merge pull request #119 from christianbrensing/LOGBACK-300 LOGBACK-300: Fixed OSGi-Manifest Commit: cbd10a44c2104e9d4681f50e1e59bfcf4496d178 https://github.com/qos-ch/logback/commit/cbd10a44c2104e9d4681f50e1e59bfcf449... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-30 (Tue, 30 Apr 2013) Changed paths: M logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java Log Message: ----------- defined executor service sizing constants in CoreConstants Commit: 1fd89398f32ac04a7a733b9dfef07f74198e76f0 https://github.com/qos-ch/logback/commit/1fd89398f32ac04a7a733b9dfef07f74198... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-30 (Tue, 30 Apr 2013) Changed paths: A logback-core/src/main/java/ch/qos/logback/core/util/ExecutorServiceUtil.java Log Message: ----------- added ExecutorServiceUtil for executor creation and shutdown This will allow logback-core and logback-access to both use the same executor configuration and shutdown logic. Commit: ef128dfdce3814f1d7e324399f11b69e6dc819b5 https://github.com/qos-ch/logback/commit/ef128dfdce3814f1d7e324399f11b69e6dc... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-30 (Tue, 30 Apr 2013) Changed paths: M logback-core/src/main/java/ch/qos/logback/core/ContextBase.java Log Message: ----------- added LifeCycle methods and lazy executor service init to ContextBase Since ContextBase has never before implemented LifeCycle, there are lots of existing uses (in tests) that would need to be modified if calling the LifeCycle methods is made a strict requirement. By using a lazy initialization of executor service, we can allow existing uses to ignore the lifecycle methods, and focus our attention on those few cases where it calling the stop method really matters. Commit: a66da9c5bf3ce1f6f840bb24a61b6902956bdc8e https://github.com/qos-ch/logback/commit/a66da9c5bf3ce1f6f840bb24a61b6902956... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-30 (Tue, 30 Apr 2013) Changed paths: M logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java Log Message: ----------- modified LoggerContext to call super.start and super.stop Commit: 805ba451da187d14414204f37ff3dbaf98413ca2 https://github.com/qos-ch/logback/commit/805ba451da187d14414204f37ff3dbaf984... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-30 (Tue, 30 Apr 2013) Changed paths: M logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java Log Message: ----------- modified LogbackValve to use ExecutorServiceUtil Previously, the executor service used here was not consistent with a recent change to ContextBase (to allow more than one concurrent asynchronous task). This commit also ensures that the executor service is shut down when the valve is stopped. Commit: c157458485a1544703b8adf534e209f6faff7000 https://github.com/qos-ch/logback/commit/c157458485a1544703b8adf534e209f6faf... Author: Ceki Gulcu <ceki@qos.ch> Date: 2013-04-30 (Tue, 30 Apr 2013) Changed paths: M logback-access/pom.xml M logback-core/src/main/java/ch/qos/logback/core/joran/event/SaxEventRecorder.java M logback-core/src/main/java/ch/qos/logback/core/joran/spi/ElementPath.java M logback-core/src/main/java/ch/qos/logback/core/joran/spi/ElementSelector.java M logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java M logback-site/src/site/pages/news.html Log Message: ----------- minor housekeeping changes Commit: 30e78f3bf4e7409c807196aa562bdbbbf6dc45a4 https://github.com/qos-ch/logback/commit/30e78f3bf4e7409c807196aa562bdbbbf6d... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-30 (Tue, 30 Apr 2013) Changed paths: M logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java Log Message: ----------- removed unused imports from LogbackValve Commit: 632d205d06e4d5cb65207e9726b6c70d3188c889 https://github.com/qos-ch/logback/commit/632d205d06e4d5cb65207e9726b6c70d318... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-30 (Tue, 30 Apr 2013) Changed paths: M logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java M logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java M logback-core/src/main/java/ch/qos/logback/core/ContextBase.java M logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java A logback-core/src/main/java/ch/qos/logback/core/util/ExecutorServiceUtil.java Log Message: ----------- Merge pull request #120 from qos-ch/LOGBACK-849-alternative Alternative approach for LOGBACK-849 Commit: 0557497abd567a063afac885bcdb988f6487090b https://github.com/qos-ch/logback/commit/0557497abd567a063afac885bcdb988f648... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-30 (Tue, 30 Apr 2013) Changed paths: M logback-core/src/test/java/ch/qos/logback/core/net/mock/MockContext.java A logback-core/src/test/java/ch/qos/logback/core/net/mock/MockExecutorService.java M logback-core/src/test/java/ch/qos/logback/core/net/server/ConcurrentServerRunnerTest.java R logback-core/src/test/java/ch/qos/logback/core/net/server/MockContext.java R logback-core/src/test/java/ch/qos/logback/core/net/server/MockExecutorService.java M logback-core/src/test/java/ch/qos/logback/core/net/server/RemoteReceiverStreamClientTest.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: ----------- moved MockContext and MockExecutorService to ..core.net.mock Commit: e7058e4ee72f614aa28c71e8f49ec26e3414c0c3 https://github.com/qos-ch/logback/commit/e7058e4ee72f614aa28c71e8f49ec26e341... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-30 (Tue, 30 Apr 2013) Changed paths: M logback-core/src/test/java/ch/qos/logback/core/net/mock/MockExecutorService.java Log Message: ----------- added missing doc comments to MockExecutorService Commit: 6ec8a1093106027544cc2d0e995b7c2c998ac6b4 https://github.com/qos-ch/logback/commit/6ec8a1093106027544cc2d0e995b7c2c998... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-30 (Tue, 30 Apr 2013) Changed paths: M logback-classic/src/test/java/ch/qos/logback/classic/net/server/SSLServerSocketReceiverTest.java M logback-classic/src/test/java/ch/qos/logback/classic/net/server/ServerSocketReceiverTest.java Log Message: ----------- fixed references to MockContext in test classes Commit: a4fcd7b91e7ca46aca243e9d7cddac6a2156bad7 https://github.com/qos-ch/logback/commit/a4fcd7b91e7ca46aca243e9d7cddac6a215... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-30 (Tue, 30 Apr 2013) Changed paths: R logback-access/src/test/java/ch/qos/logback/access/net/MockSocketServer.java M logback-access/src/test/java/ch/qos/logback/access/net/PackageTest.java R logback-access/src/test/java/ch/qos/logback/access/net/SocketAppenderTest.java M logback-classic/src/test/java/ch/qos/logback/classic/net/PackageTest.java R logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java Log Message: ----------- removed old SocketAppenderTest from classic and access These test classes were really testing SocketAppenderBase not SocketAppender, per se. The new implementation of SocketAppenderBase is significantly different and will require a new unit test suite. Commit: c7f8df9bd07547491f252fdb4c55b08913f93def https://github.com/qos-ch/logback/commit/c7f8df9bd07547491f252fdb4c55b08913f... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-30 (Tue, 30 Apr 2013) Changed paths: M logback-core/src/main/java/ch/qos/logback/core/net/SSLSocketAppenderBase.java M logback-core/src/main/java/ch/qos/logback/core/net/SocketAppenderBase.java A logback-core/src/test/java/ch/qos/logback/core/net/SocketAppenderBaseTest.java Log Message: ----------- improved SocketAppenderBase SocketAppenderBase now uses SocketConnector for its (re-)connection logic, and uses an asynchronous task to dispatch events to the remote receiver. A configurable queue is utilized to relay logging events from the append method to the dispatch task. When the queue length is zero (the default), a SynchronousQueue is utilized, preserving the previous appender behavior. When the queue length is greater than zero, a bounded queue is utilized, allowing the appender to efficiently drop logging events when remote receiver (or network) cannot keep up with the rate of logging events delivered to the appender. Commit: 735d127140b5bd3f7ab5819c2c9a00f64a4cd62b https://github.com/qos-ch/logback/commit/735d127140b5bd3f7ab5819c2c9a00f64a4... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-30 (Tue, 30 Apr 2013) Changed paths: M logback-access/src/main/java/ch/qos/logback/access/net/SSLSocketAppender.java M logback-access/src/main/java/ch/qos/logback/access/net/SocketAppender.java M logback-classic/src/main/java/ch/qos/logback/classic/net/SSLSocketAppender.java M logback-classic/src/main/java/ch/qos/logback/classic/net/SocketAppender.java Log Message: ----------- modified concrete appenders to use appropriate constructors Mutable fields in SocketAppenderBase were previously exposed as protected fields and modified by constructors in concrete subclasses. This commit improves encapsulation of the base class by exposing protected constructors for subclasses to invoke rather than directly exposing the fields. These new constructors are marked as deprecated, as the convenience constructors on the base classes (which are also deprecated) are the sole reason for their existence. A future release should remove all but the no-arg constructor from the base class and subclasses. Commit: 43e7693e8d345152e95a8f184207c34325f8e1ad https://github.com/qos-ch/logback/commit/43e7693e8d345152e95a8f184207c34325f... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-30 (Tue, 30 Apr 2013) Log Message: ----------- Merge remote-tracking branch 'origin/LOGBACK-848' into LOGBACK-848 Conflicts: logback-core/src/main/java/ch/qos/logback/core/ContextBase.java Compare: https://github.com/qos-ch/logback/compare/1911c7fb7e8f...43e7693e8d34