Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4b552d5d Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4b552d5d Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4b552d5d Branch: refs/heads/master Commit: 4b552d5df02bcf1e208f4a2134d431ecb3d27051 Parents: e2c32ad 3faed6d Author: rpopma <[email protected]> Authored: Fri Sep 5 02:01:16 2014 +0900 Committer: rpopma <[email protected]> Committed: Fri Sep 5 02:01:16 2014 +0900 ---------------------------------------------------------------------- .../logging/log4j/io/ByteStreamLogger.java | 8 +- .../logging/log4j/io/CharStreamLogger.java | 2 +- .../log4j/io/IncompatibleLoggerException.java | 46 ++++ .../log4j/io/LoggerBufferedInputStream.java | 51 +--- .../logging/log4j/io/LoggerBufferedReader.java | 26 +- .../log4j/io/LoggerFilterOutputStream.java | 25 +- .../logging/log4j/io/LoggerFilterWriter.java | 14 +- .../logging/log4j/io/LoggerInputStream.java | 23 +- .../logging/log4j/io/LoggerOutputStream.java | 22 +- .../logging/log4j/io/LoggerPrintStream.java | 79 +----- .../logging/log4j/io/LoggerPrintWriter.java | 46 +--- .../apache/logging/log4j/io/LoggerReader.java | 17 +- .../apache/logging/log4j/io/LoggerStreams.java | 267 +++++++++++-------- .../apache/logging/log4j/io/LoggerWriter.java | 12 +- .../apache/logging/log4j/io/package-info.java | 20 ++ .../io/AbstractLoggerOutputStreamTest.java | 18 +- .../log4j/io/AbstractLoggerWriterTest.java | 18 +- .../logging/log4j/io/AbstractStreamTest.java | 19 +- ...LoggerBufferedInputStreamCallerInfoTest.java | 12 +- .../log4j/io/LoggerBufferedInputStreamTest.java | 6 +- .../io/LoggerBufferedReaderCallerInfoTest.java | 10 +- .../log4j/io/LoggerBufferedReaderTest.java | 13 +- .../log4j/io/LoggerFilterOutputStreamTest.java | 5 +- .../log4j/io/LoggerFilterWriterTest.java | 5 +- .../io/LoggerInputStreamCallerInfoTest.java | 9 +- .../logging/log4j/io/LoggerInputStreamTest.java | 13 +- .../io/LoggerOutputStreamCallerInfoTest.java | 6 +- .../log4j/io/LoggerOutputStreamTest.java | 4 +- .../io/LoggerPrintStreamCallerInfoTest.java | 12 +- .../logging/log4j/io/LoggerPrintStreamTest.java | 13 +- .../io/LoggerPrintWriterCallerInfoTest.java | 7 +- .../logging/log4j/io/LoggerPrintWriterTest.java | 11 +- .../log4j/io/LoggerReaderCallerInfoTest.java | 7 +- .../logging/log4j/io/LoggerReaderTest.java | 9 +- .../io/LoggerStreamsCallerInfoTesting.java | 8 +- .../logging/log4j/io/LoggerWriterTest.java | 4 +- 36 files changed, 418 insertions(+), 449 deletions(-) ----------------------------------------------------------------------
