Branch: refs/heads/master Home: https://github.com/qos-ch/logback Commit: 3ca5f37e6921a9f7f578b924a34a4afdd8fe169d https://github.com/qos-ch/logback/commit/3ca5f37e6921a9f7f578b924a34a4afdd8f... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-11 (Thu, 11 Apr 2013) Changed paths: R logback-core/src/main/java/ch/qos/logback/core/net/server/RemoteLoggerClient.java R logback-core/src/main/java/ch/qos/logback/core/net/server/RemoteLoggerServerListener.java R logback-core/src/main/java/ch/qos/logback/core/net/server/RemoteLoggerServerRunner.java R logback-core/src/main/java/ch/qos/logback/core/net/server/RemoteLoggerStreamClient.java A logback-core/src/main/java/ch/qos/logback/core/net/server/RemoteReceiverClient.java A logback-core/src/main/java/ch/qos/logback/core/net/server/RemoteReceiverServerListener.java A logback-core/src/main/java/ch/qos/logback/core/net/server/RemoteReceiverServerRunner.java A logback-core/src/main/java/ch/qos/logback/core/net/server/RemoteReceiverStreamClient.java 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/InstrumentedServerSocketAppenderBase.java R logback-core/src/test/java/ch/qos/logback/core/net/server/RemoteLoggerStreamClientTest.java A 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/ServerSocketAppenderBaseTest.java Log Message: ----------- replaced references to "remote logger" with "remote receiver" In preparation for introducing the concept of a "receiver" component (which can be either a component that listens passively for incoming connections from remote peers or one that actively connects to a remote peer), this commit fixes up the taxonomy in the ServerSocketAppenderBase implementation. Now a ServerSocketAppender will have zero or more connected remote receiver clients. Commit: 59e2b78dda2143aa69626d2dfce13d716e67f376 https://github.com/qos-ch/logback/commit/59e2b78dda2143aa69626d2dfce13d716e6... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-11 (Thu, 11 Apr 2013) Changed paths: A logback-classic/src/main/java/ch/qos/logback/classic/net/ReceiverBase.java Log Message: ----------- added ReceiverBase for receiver implementations The existing SocketRemote and SocketServer classes will be refactored to descend from this base class. Commit: e51b751bdc70fcd43b5e292044be0424122e398b https://github.com/qos-ch/logback/commit/e51b751bdc70fcd43b5e292044be0424122... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-11 (Thu, 11 Apr 2013) Changed paths: M logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java A logback-classic/src/main/java/ch/qos/logback/classic/joran/action/ReceiverAction.java R logback-classic/src/main/java/ch/qos/logback/classic/joran/action/ServerAction.java R logback-classic/src/main/java/ch/qos/logback/classic/joran/action/SocketRemoteAction.java Log Message: ----------- Transformed SocketRemoteAction and ServerAction into ReceiverAction ReceiverAction can instantiate a component that is a subtype of ReceiverBase. SocketRemote and SocketServer will be refactored to extend the ReceiverBase type. Commit: e5acdb7dcdd4a886ab19783f1b3e4690a3647cc5 https://github.com/qos-ch/logback/commit/e5acdb7dcdd4a886ab19783f1b3e4690a36... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-11 (Thu, 11 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/server/SSLServerSocketAppenderBase.java A logback-core/src/main/java/ch/qos/logback/core/net/ssl/SSLComponent.java Log Message: ----------- added SSLComponent interface to identify SSL components for config This will eliminate the need to add a nested component rule for each new SSL component. Commit: 4228a9e98eee1e3c3608ec31ac0096634bd1fd7d https://github.com/qos-ch/logback/commit/4228a9e98eee1e3c3608ec31ac0096634bd... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-11 (Thu, 11 Apr 2013) Changed paths: M logback-classic/src/main/java/ch/qos/logback/classic/util/DefaultNestedComponentRules.java Log Message: ----------- modified nested component rules to use new SSLComponent interface Commit: fab370acce32470874745c0ee1270227279b4bcd https://github.com/qos-ch/logback/commit/fab370acce32470874745c0ee1270227279... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-11 (Thu, 11 Apr 2013) Changed paths: M logback-access/src/main/java/ch/qos/logback/access/joran/JoranConfigurator.java Log Message: ----------- modified JoranConfigurator to use new SSLComponent interface Commit: 66993de11e89846149d1553628858b6ee4869fd8 https://github.com/qos-ch/logback/commit/66993de11e89846149d1553628858b6ee48... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-11 (Thu, 11 Apr 2013) Changed paths: A logback-classic/src/main/java/ch/qos/logback/classic/net/SSLSocketReceiver.java R logback-classic/src/main/java/ch/qos/logback/classic/net/SSLSocketRemote.java A logback-classic/src/main/java/ch/qos/logback/classic/net/SocketReceiver.java R logback-classic/src/main/java/ch/qos/logback/classic/net/SocketRemote.java M logback-classic/src/test/java/ch/qos/logback/classic/net/PackageTest.java A logback-classic/src/test/java/ch/qos/logback/classic/net/SSLSocketReceiverTest.java R logback-classic/src/test/java/ch/qos/logback/classic/net/SSLSocketRemoteTest.java A logback-classic/src/test/java/ch/qos/logback/classic/net/SocketReceiverTest.java R logback-classic/src/test/java/ch/qos/logback/classic/net/SocketRemoteTest.java Log Message: ----------- refactored SocketRemote to extend ReceiverBase Also fixed up the taxonomy -- what was a SocketRemote is now a receiver component that connects to a remote appender peer. Commit: 12474cb421beae6a3ceac9b4e8f0b3b92c972acb https://github.com/qos-ch/logback/commit/12474cb421beae6a3ceac9b4e8f0b3b92c9... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-11 (Thu, 11 Apr 2013) Changed paths: M logback-core/src/main/java/ch/qos/logback/core/net/server/ConcurrentServerRunner.java M logback-core/src/main/java/ch/qos/logback/core/net/server/ServerRunner.java 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/ConcurrentServerRunnerTest.java M logback-core/src/test/java/ch/qos/logback/core/net/server/MockServerRunner.java M 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/ServerSocketAppenderBaseTest.java Log Message: ----------- removed ServerRunner.start method The object that is composed with a ServerRunner already implements LifeCycle. Having a start method complicates the use of the runner without adding any real value. Commit: 2c2520a882bd0cf3c9e679a3a3d7739389f97e84 https://github.com/qos-ch/logback/commit/2c2520a882bd0cf3c9e679a3a3d7739389f... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-11 (Thu, 11 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 Log Message: ----------- a receiver now has-a Runnable, no longer is-a Runnable This will make it easier to refactor SocketServer so that it extends ReceiverBase. Commit: 32bcbbe5ef6ee192d427cc99dbf10d2ae06b9ac5 https://github.com/qos-ch/logback/commit/32bcbbe5ef6ee192d427cc99dbf10d2ae06... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-11 (Thu, 11 Apr 2013) Changed paths: A logback-classic/src/main/java/ch/qos/logback/classic/net/server/SSLServerSocketReceiver.java R logback-classic/src/main/java/ch/qos/logback/classic/net/server/SSLSocketServer.java A logback-classic/src/main/java/ch/qos/logback/classic/net/server/ServerSocketReceiver.java R logback-classic/src/main/java/ch/qos/logback/classic/net/server/SocketServer.java M logback-classic/src/main/java/ch/qos/logback/classic/net/server/SocketServerNestedComponentRegistryRules.java A logback-classic/src/test/java/ch/qos/logback/classic/net/server/InstrumentedServerSocketReceiver.java R logback-classic/src/test/java/ch/qos/logback/classic/net/server/InstrumentedSocketServer.java M logback-classic/src/test/java/ch/qos/logback/classic/net/server/MockThreadPoolFactoryBean.java A logback-classic/src/test/java/ch/qos/logback/classic/net/server/SSLServerSocketReceiverTest.java R logback-classic/src/test/java/ch/qos/logback/classic/net/server/SSLSocketServerTest.java A logback-classic/src/test/java/ch/qos/logback/classic/net/server/ServerSocketReceiverFunctionalTest.java A logback-classic/src/test/java/ch/qos/logback/classic/net/server/ServerSocketReceiverTest.java R logback-classic/src/test/java/ch/qos/logback/classic/net/server/SocketServerFunctionalTest.java R logback-classic/src/test/java/ch/qos/logback/classic/net/server/SocketServerTest.java Log Message: ----------- refactored SocketServer so that it extends ReceiverBase Commit: 391c1207fca131ea6ca629d8e201a465910edef4 https://github.com/qos-ch/logback/commit/391c1207fca131ea6ca629d8e201a465910... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-11 (Thu, 11 Apr 2013) Changed paths: M logback-classic/src/main/java/ch/qos/logback/classic/net/ReceiverBase.java Log Message: ----------- ReceiverBase.start now creates executor before calling shouldStart The subclass may need a reference to executor to pass to objects that will need it later when the receiver is running. Commit: babb52e3be69f5e7c259fd325393af95c351fffa https://github.com/qos-ch/logback/commit/babb52e3be69f5e7c259fd325393af95c35... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-11 (Thu, 11 Apr 2013) Changed paths: A logback-examples/src/main/java/chapters/appenders/socket/ServerSocketAppender1.java A logback-examples/src/main/java/chapters/appenders/socket/ServerSocketReceiver1.java A logback-examples/src/main/java/chapters/appenders/socket/SocketReceiver1.java R logback-examples/src/main/java/chapters/appenders/socket/SocketRemoteClient.java R logback-examples/src/main/java/chapters/appenders/socket/SocketRemoteServer.java R logback-examples/src/main/java/chapters/appenders/socket/SocketServer.java A logback-examples/src/main/java/chapters/appenders/socket/client2.xml R logback-examples/src/main/java/chapters/appenders/socket/remoteClient.xml R logback-examples/src/main/java/chapters/appenders/socket/remoteServer.xml M logback-examples/src/main/java/chapters/appenders/socket/server3.xml A logback-examples/src/main/java/chapters/appenders/socket/server4.xml A logback-examples/src/main/java/chapters/appenders/socket/ssl/client2.xml R logback-examples/src/main/java/chapters/appenders/socket/ssl/remoteClient.xml R logback-examples/src/main/java/chapters/appenders/socket/ssl/remoteServer.xml M logback-examples/src/main/java/chapters/appenders/socket/ssl/server2.xml A logback-examples/src/main/java/chapters/appenders/socket/ssl/server3.xml Log Message: ----------- reworked examples replacing to "server" and "remote" with "receiver" Commit: dc054c4a49a6a61ebabd0e4b2e9c7acba3dd1bd3 https://github.com/qos-ch/logback/commit/dc054c4a49a6a61ebabd0e4b2e9c7acba3d... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-11 (Thu, 11 Apr 2013) Changed paths: M logback-classic/src/main/java/ch/qos/logback/classic/joran/action/ReceiverAction.java Log Message: ----------- ReceiverAction now casts to ReceiverBase, not SocketReceiver Commit: 3176d1493b43a0f915ab66cdd7366d22101e5070 https://github.com/qos-ch/logback/commit/3176d1493b43a0f915ab66cdd7366d22101... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-11 (Thu, 11 Apr 2013) Changed paths: M logback-site/src/site/pages/manual/appenders.html M logback-site/src/site/pages/manual/usingSSL.html Log Message: ----------- updated docs to account for receiver component type Still needs lots of proofreading... Commit: fd4bb033a95ec88ce257c1484c3af941aa682d68 https://github.com/qos-ch/logback/commit/fd4bb033a95ec88ce257c1484c3af941aa6... Author: Carl Harris <ceharris@vt.edu> Date: 2013-04-11 (Thu, 11 Apr 2013) Changed paths: M logback-access/src/main/java/ch/qos/logback/access/joran/JoranConfigurator.java M logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java A logback-classic/src/main/java/ch/qos/logback/classic/joran/action/ReceiverAction.java R logback-classic/src/main/java/ch/qos/logback/classic/joran/action/ServerAction.java R logback-classic/src/main/java/ch/qos/logback/classic/joran/action/SocketRemoteAction.java A logback-classic/src/main/java/ch/qos/logback/classic/net/ReceiverBase.java A logback-classic/src/main/java/ch/qos/logback/classic/net/SSLSocketReceiver.java R logback-classic/src/main/java/ch/qos/logback/classic/net/SSLSocketRemote.java A logback-classic/src/main/java/ch/qos/logback/classic/net/SocketReceiver.java R logback-classic/src/main/java/ch/qos/logback/classic/net/SocketRemote.java A logback-classic/src/main/java/ch/qos/logback/classic/net/server/SSLServerSocketReceiver.java R logback-classic/src/main/java/ch/qos/logback/classic/net/server/SSLSocketServer.java A logback-classic/src/main/java/ch/qos/logback/classic/net/server/ServerSocketReceiver.java R logback-classic/src/main/java/ch/qos/logback/classic/net/server/SocketServer.java M 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-classic/src/test/java/ch/qos/logback/classic/net/PackageTest.java A logback-classic/src/test/java/ch/qos/logback/classic/net/SSLSocketReceiverTest.java R logback-classic/src/test/java/ch/qos/logback/classic/net/SSLSocketRemoteTest.java A logback-classic/src/test/java/ch/qos/logback/classic/net/SocketReceiverTest.java R logback-classic/src/test/java/ch/qos/logback/classic/net/SocketRemoteTest.java A logback-classic/src/test/java/ch/qos/logback/classic/net/server/InstrumentedServerSocketReceiver.java R logback-classic/src/test/java/ch/qos/logback/classic/net/server/InstrumentedSocketServer.java M logback-classic/src/test/java/ch/qos/logback/classic/net/server/MockThreadPoolFactoryBean.java A logback-classic/src/test/java/ch/qos/logback/classic/net/server/SSLServerSocketReceiverTest.java R logback-classic/src/test/java/ch/qos/logback/classic/net/server/SSLSocketServerTest.java A logback-classic/src/test/java/ch/qos/logback/classic/net/server/ServerSocketReceiverFunctionalTest.java A logback-classic/src/test/java/ch/qos/logback/classic/net/server/ServerSocketReceiverTest.java R logback-classic/src/test/java/ch/qos/logback/classic/net/server/SocketServerFunctionalTest.java R logback-classic/src/test/java/ch/qos/logback/classic/net/server/SocketServerTest.java M logback-core/src/main/java/ch/qos/logback/core/net/SSLSocketAppenderBase.java M logback-core/src/main/java/ch/qos/logback/core/net/server/ConcurrentServerRunner.java R logback-core/src/main/java/ch/qos/logback/core/net/server/RemoteLoggerClient.java R logback-core/src/main/java/ch/qos/logback/core/net/server/RemoteLoggerServerListener.java R logback-core/src/main/java/ch/qos/logback/core/net/server/RemoteLoggerServerRunner.java R logback-core/src/main/java/ch/qos/logback/core/net/server/RemoteLoggerStreamClient.java A logback-core/src/main/java/ch/qos/logback/core/net/server/RemoteReceiverClient.java A logback-core/src/main/java/ch/qos/logback/core/net/server/RemoteReceiverServerListener.java A logback-core/src/main/java/ch/qos/logback/core/net/server/RemoteReceiverServerRunner.java A logback-core/src/main/java/ch/qos/logback/core/net/server/RemoteReceiverStreamClient.java M logback-core/src/main/java/ch/qos/logback/core/net/server/SSLServerSocketAppenderBase.java M logback-core/src/main/java/ch/qos/logback/core/net/server/ServerRunner.java M logback-core/src/main/java/ch/qos/logback/core/net/server/ServerSocketAppenderBase.java A logback-core/src/main/java/ch/qos/logback/core/net/ssl/SSLComponent.java M logback-core/src/test/java/ch/qos/logback/core/net/server/ConcurrentServerRunnerTest.java M logback-core/src/test/java/ch/qos/logback/core/net/server/InstrumentedServerSocketAppenderBase.java M logback-core/src/test/java/ch/qos/logback/core/net/server/MockServerRunner.java M 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/RemoteLoggerStreamClientTest.java A 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/ServerSocketAppenderBaseTest.java A logback-examples/src/main/java/chapters/appenders/socket/ServerSocketAppender1.java A logback-examples/src/main/java/chapters/appenders/socket/ServerSocketReceiver1.java A logback-examples/src/main/java/chapters/appenders/socket/SocketReceiver1.java R logback-examples/src/main/java/chapters/appenders/socket/SocketRemoteClient.java R logback-examples/src/main/java/chapters/appenders/socket/SocketRemoteServer.java R logback-examples/src/main/java/chapters/appenders/socket/SocketServer.java A logback-examples/src/main/java/chapters/appenders/socket/client2.xml R logback-examples/src/main/java/chapters/appenders/socket/remoteClient.xml R logback-examples/src/main/java/chapters/appenders/socket/remoteServer.xml M logback-examples/src/main/java/chapters/appenders/socket/server3.xml A logback-examples/src/main/java/chapters/appenders/socket/server4.xml A logback-examples/src/main/java/chapters/appenders/socket/ssl/client2.xml R logback-examples/src/main/java/chapters/appenders/socket/ssl/remoteClient.xml R logback-examples/src/main/java/chapters/appenders/socket/ssl/remoteServer.xml M logback-examples/src/main/java/chapters/appenders/socket/ssl/server2.xml A logback-examples/src/main/java/chapters/appenders/socket/ssl/server3.xml M logback-site/src/site/pages/manual/appenders.html M logback-site/src/site/pages/manual/usingSSL.html Log Message: ----------- Merge remote-tracking branch 'origin/receiverComponent' This branch refactors the previously contributed "server" and "remote" components such that they now extend a common "receiver" component. A receiver is a component that receives logging events from a remote appender. A connection between and an appender and a receiver may be initiated in either direction; i.e. a receiver may initiate the connection to an appender or vice-versa. The receiver component is configured in Joran using a <receiver> element. The class specified in this element determines whether the receiver will passively await connections from remote appenders (i.e. as in the legacy SimpleSocketServer) or whether it will initiate a connection to a remote appender (a ServerSocketAppender). Compare: https://github.com/qos-ch/logback/compare/af2932a5220d...fd4bb033a95e