You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ts...@apache.org on 2018/08/19 12:43:07 UTC
[13/13] logging-log4cxx git commit: Merge branch 'master' into
release_scripts
Merge branch 'master' into release_scripts
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/2fe5572b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/2fe5572b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/2fe5572b
Branch: refs/heads/release_scripts
Commit: 2fe5572b53047873b3b479fa98b71b5edb56537f
Parents: 15e84ca fb126e7
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Sun Aug 19 14:42:37 2018 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Sun Aug 19 14:42:37 2018 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 2 +
src/main/cpp/appenderskeleton.cpp | 2 +-
src/main/cpp/asyncappender.cpp | 24 +--
src/main/cpp/charsetdecoder.cpp | 2 +-
src/main/cpp/class.cpp | 2 +-
src/main/cpp/defaultrepositoryselector.cpp | 8 +-
src/main/cpp/domconfigurator.cpp | 44 +++---
src/main/cpp/exception.cpp | 14 +-
src/main/cpp/file.cpp | 8 +-
src/main/cpp/fileappender.cpp | 14 +-
src/main/cpp/fileinputstream.cpp | 2 +-
src/main/cpp/gzcompressaction.cpp | 10 +-
src/main/cpp/inetaddress.cpp | 6 +-
src/main/cpp/layout.cpp | 4 +-
src/main/cpp/logger.cpp | 90 +++++------
src/main/cpp/logstream.cpp | 74 ++++-----
src/main/cpp/messagebuffer.cpp | 8 +-
src/main/cpp/obsoleterollingfileappender.cpp | 8 +-
src/main/cpp/optionconverter.cpp | 4 +-
src/main/cpp/properties.cpp | 4 +-
src/main/cpp/propertyconfigurator.cpp | 4 +-
src/main/cpp/rootlogger.cpp | 2 +-
src/main/cpp/serversocket.cpp | 26 +--
src/main/cpp/smtpappender.cpp | 70 ++++----
src/main/cpp/socket.cpp | 10 +-
src/main/cpp/syslogwriter.cpp | 2 +-
src/main/cpp/system.cpp | 2 +-
src/main/cpp/telnetappender.cpp | 12 +-
src/main/cpp/threadcxx.cpp | 24 +--
src/main/cpp/threadlocal.cpp | 6 +-
src/main/cpp/threadspecificdata.cpp | 4 +-
src/main/cpp/transcoder.cpp | 18 +--
src/main/cpp/transform.cpp | 12 +-
src/main/cpp/writer.cpp | 2 +-
src/main/cpp/writerappender.cpp | 6 +-
src/main/cpp/xmllayout.cpp | 8 +-
src/main/include/log4cxx/asyncappender.h | 24 +--
src/main/include/log4cxx/consoleappender.h | 2 +-
.../include/log4cxx/dailyrollingfileappender.h | 2 +-
src/main/include/log4cxx/db/odbcappender.h | 8 +-
src/main/include/log4cxx/defaultloggerfactory.h | 2 +-
src/main/include/log4cxx/file.h | 6 +-
src/main/include/log4cxx/filter/andfilter.h | 4 +-
.../include/log4cxx/filter/expressionfilter.h | 2 +-
.../include/log4cxx/filter/locationinfofilter.h | 2 +-
.../include/log4cxx/filter/propertyfilter.h | 2 +-
.../log4cxx/helpers/appenderattachableimpl.h | 4 +-
.../include/log4cxx/helpers/aprinitializer.h | 8 +-
.../log4cxx/helpers/bytearrayinputstream.h | 2 +-
.../include/log4cxx/helpers/charsetdecoder.h | 4 +-
src/main/include/log4cxx/helpers/condition.h | 2 +-
src/main/include/log4cxx/helpers/cyclicbuffer.h | 2 +-
src/main/include/log4cxx/helpers/exception.h | 6 +-
.../include/log4cxx/helpers/fileinputstream.h | 6 +-
.../include/log4cxx/helpers/fileoutputstream.h | 2 +-
src/main/include/log4cxx/helpers/inputstream.h | 4 +-
.../include/log4cxx/helpers/inputstreamreader.h | 2 +-
src/main/include/log4cxx/helpers/loglog.h | 4 +-
.../include/log4cxx/helpers/messagebuffer.h | 38 ++---
.../include/log4cxx/helpers/optionconverter.h | 2 +-
src/main/include/log4cxx/helpers/reader.h | 2 +-
src/main/include/log4cxx/helpers/serversocket.h | 4 +-
.../include/log4cxx/helpers/simpledateformat.h | 2 +-
src/main/include/log4cxx/helpers/socket.h | 12 +-
.../log4cxx/helpers/socketoutputstream.h | 4 +-
.../include/log4cxx/helpers/systemoutwriter.h | 4 +-
src/main/include/log4cxx/helpers/thread.h | 10 +-
src/main/include/log4cxx/helpers/threadlocal.h | 8 +-
.../log4cxx/helpers/threadspecificdata.h | 6 +-
src/main/include/log4cxx/helpers/transcoder.h | 16 +-
src/main/include/log4cxx/layout.h | 2 +-
src/main/include/log4cxx/logmanager.h | 4 +-
src/main/include/log4cxx/logstring.h | 4 +-
src/main/include/log4cxx/ndc.h | 24 +--
src/main/include/log4cxx/net/smtpappender.h | 12 +-
.../log4cxx/net/socketappenderskeleton.h | 8 +-
src/main/include/log4cxx/net/telnetappender.h | 6 +-
.../log4cxx/pattern/classnamepatternconverter.h | 4 +-
.../log4cxx/pattern/datepatternconverter.h | 4 +-
.../log4cxx/pattern/filedatepatternconverter.h | 4 +-
.../pattern/filelocationpatternconverter.h | 4 +-
.../include/log4cxx/pattern/formattinginfo.h | 4 +-
.../pattern/fulllocationpatternconverter.h | 4 +-
.../log4cxx/pattern/integerpatternconverter.h | 4 +-
.../log4cxx/pattern/levelpatternconverter.h | 4 +-
.../pattern/linelocationpatternconverter.h | 4 +-
.../pattern/lineseparatorpatternconverter.h | 4 +-
.../log4cxx/pattern/literalpatternconverter.h | 4 +-
.../log4cxx/pattern/loggerpatternconverter.h | 4 +-
.../pattern/loggingeventpatternconverter.h | 4 +-
.../log4cxx/pattern/messagepatternconverter.h | 4 +-
.../pattern/methodlocationpatternconverter.h | 4 +-
.../include/log4cxx/pattern/nameabbreviator.h | 4 +-
.../log4cxx/pattern/ndcpatternconverter.h | 4 +-
.../include/log4cxx/pattern/patternparser.h | 2 +-
.../pattern/propertiespatternconverter.h | 4 +-
.../pattern/relativetimepatternconverter.h | 4 +-
.../log4cxx/pattern/threadpatternconverter.h | 4 +-
.../throwableinformationpatternconverter.h | 4 +-
src/main/include/log4cxx/propertyconfigurator.h | 2 +-
src/main/include/log4cxx/provisionnode.h | 8 +-
.../rolling/filterbasedtriggeringpolicy.h | 4 +-
.../log4cxx/rolling/manualtriggeringpolicy.h | 2 +-
.../log4cxx/rolling/rollingfileappender.h | 8 +-
.../rolling/rollingfileappenderskeleton.h | 8 +-
.../include/log4cxx/rolling/rollingpolicybase.h | 6 +-
.../log4cxx/rolling/sizebasedtriggeringpolicy.h | 2 +-
.../include/log4cxx/rolling/triggeringpolicy.h | 4 +-
.../include/log4cxx/rolling/zipcompressaction.h | 2 +-
.../include/log4cxx/spi/appenderattachable.h | 2 +-
src/main/include/log4cxx/spi/errorhandler.h | 2 +-
src/main/include/log4cxx/spi/filter.h | 2 +-
.../log4cxx/spi/hierarchyeventlistener.h | 4 +-
src/main/include/log4cxx/spi/loggerfactory.h | 2 +-
src/main/include/log4cxx/spi/loggerrepository.h | 2 +-
src/main/include/log4cxx/stream.h | 158 +++++++++----------
.../log4cxx/varia/fallbackerrorhandler.h | 2 +-
src/main/include/log4cxx/writerappender.h | 2 +-
src/main/include/log4cxx/xml/domconfigurator.h | 8 +-
src/main/include/log4cxx/xml/xmllayout.h | 8 +-
src/site/resources/.htaccess | 33 ----
src/test/cpp/decodingtest.cpp | 151 ++++++++++++++++++
src/test/cpp/encodingtest.cpp | 71 ++++++---
src/test/resources/input/decoding/Makefile.am | 31 ++++
src/test/resources/input/decoding/UTF-16.txt | Bin 0 -> 18 bytes
src/test/resources/input/decoding/UTF-16BE.txt | Bin 0 -> 16 bytes
src/test/resources/input/decoding/UTF-16LE.txt | Bin 0 -> 16 bytes
src/test/resources/input/decoding/UTF-8.txt | 1 +
src/test/resources/input/decoding/ascii.txt | 1 +
src/test/resources/input/decoding/latin1.txt | 1 +
src/test/resources/input/xml/fallback1.xml | 14 +-
131 files changed, 812 insertions(+), 621 deletions(-)
----------------------------------------------------------------------