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 2020/02/16 18:16:35 UTC
[logging-log4cxx] branch master updated (ed1e4b4 -> 6105320)
This is an automated email from the ASF dual-hosted git repository.
tschoening pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git.
from ed1e4b4 Spelling
add a853310 Add support for building and testing with cmake
add 774ea16 Add support for building and testing with cmake
add b472300 Simplify integration into vcpkg
add e3000f6 Fix issues building on Linux
add 80a9fdb Disable building tests by default to conform with vcpkg guidelines
add d919ea1 Provide find modules for APR and APR-Util. Add the version resource to log4cxx.dll
add c244c28 Build examples when building tests
add e64b7cf Use cmake from maven to build and only use ant for site deployment and release
add 08d6176 Fix some test case failures
add dc7dc14 Remove unused files
add e5f8af1 Set the letter case of find modules to that required by case sensitive filesystems
add 704a80f Merge branch 'master' of https://github.com/apache/logging-log4cxx
add 6c1e0b6 Set the letter case of find modules to that required by case sensitive filesystems
add 5b81898 Set the letter case of find modules to that required by case sensitive filesystems
add 0504bc5 Merge branch 'master' of https://github.com/stephen-webb/logging-log4cxx
add 4ffba69 Merge https://github.com/apache/logging-log4cxx
add c3146a5 Add JSON appender and test
add f3edfc4 Merge branch 'master' of https://github.com/stephen-webb/logging-log4cxx
add 48c597b Fix some test case failures
add b3bec51 Remove unused files
add 5b5ec13 Set release date to today.
add a71f936 Set the letter case of find modules to that required by case sensitive filesystems
add 472d97b Set the letter case of find modules to that required by case sensitive filesystems
add 73f7333 Add JSON appender and test
add 426660e Merge https://github.com/apache/logging-log4cxx into replace-ant-build-with-cmake
add 7995db2 Merge branch 'replace-ant-build-with-cmake' of https://github.com/stephen-webb/logging-log4cxx into replace-ant-build-with-cmake
add 8dc8120 Fix some test case failures
add 4745721 Use automatic checks instead of options for log4cxx_private.h configuration
add c4f1b3d Provide install directory variables as defined by the GNU Coding Standards
add 6862c5e Use semantic versioning symbolic links in the installed target
add f133149 Install a pkgconfig file on unix systems
add d08e392 Fix failing defaultinittestcase
add 06875bd Revert "Fix failing defaultinittestcase"
add b9d9b0e Fix failing defaultinittestcase
add cd4a455 Only include smtpappendertestcase when libesmtp is available
add d5b5c38 Run autoconf during packaging if the OS is unix
add e0b4e4d Remove ant build references from build instructions. Add instructions for building from source on Windows
add ac90504 Change to cmake-maven-plugin that works on Windows
add 6ae3567 Fix typo in instructions for building from source on Windows
add d0c6cae Allow maven to be used with generators that need to be told which configuration to test
add b971dd0 Make socketservertestcase work independently of ant build
add a261ca7 Remove cpptasks as a dependency
add 178598b Allow tests on Windows to be run from ctest
add 84d3b60 Add platform specific instructions for cmake install
add 2027010 Merge branch 'replace-ant-build-with-cmake' of https://github.com/stephen-webb/logging-log4cxx into replace-ant-build-with-cmake
add c8eb659 Halt with an error if either APR or APR-Util cannot be found
add c36fea0 Make the file render properly.
add bb9ab5f Enhance support for paths with spaces by simply using a different divider character.
add e2c3533 Make the file render properly.
add 05e107a Allow the socketservertestcase to be run on Windows
add 0e5aee9 Allow the socketservertestcase to be built with Java 8
add 13a1eed Fix abnormal termination fault in socketservertestcase. Remove C++11 code.
add af0134a Prevent test case failures on Windows by excluding tests that require 'sed'
add 0baf607 These two test cases failed before, but things look to me like their log config and witness was simply wrong: The other tests use `%c` instead of `%C` and `root` as the keyword as well and looking at the docs for `%C` using that might make no sense at all. The log message is transferred using network communication and there most likely is no issuing class to generate by log4j unless that is communicated over the wire as well. I guess that's simply not the case. Because t [...]
add e8fe489 Implement fail-fast, to make the "if" easier to read. Things might get outsourced into functions this way easier as well.
add c846782 Reformatted the tests using AStyle and the settings used for other source case in the past already. The tests were very inconsistent and that makes adding new code unnecessary difficult. As nobody objected for the past applied code style, I'm using it again.
add 454b211 Wrong order of lines.
add a630560 Corrected tabs vs. spaces.
add 3775ffa Prevent socketservertestcase failures when using Maven to build and test
add 8880c68 Merge branch 'replace-ant-build-with-cmake' of https://github.com/stephen-webb/logging-log4cxx into ghpr_14_replace-ant-build-with-cmake
add 2425d74 Add configuration summary
add 397e48f Output to the user if we are building tests
add 8eca44f Document how to disable tests
add 6105320 Merge pull request #16 from rm5248/rm-cmake-fixes
No new revisions were added by this update.
Summary of changes:
.astylerc | 1 +
CMakeLists.txt | 104 +
build.xml | 2057 ++------------------
configure-aprutil.bat | 19 -
pom.xml | 156 +-
src/CMakeLists.txt | 13 +
src/ant/apr-build.xml | 851 --------
src/ant/apr-util-build.xml | 722 -------
src/ant/common.xml | 43 -
src/ant/esmtp-build.xml | 207 --
src/ant/find-apr-util.xml | 369 ----
src/ant/find-apr.xml | 370 ----
src/ant/find-libesmtp.xml | 363 ----
src/assembly/source.xml | 43 +-
src/changes/changes.xml | 3 +-
src/cmake/FindAPR-Util.cmake | 45 +
src/cmake/FindAPR.cmake | 44 +
src/cmake/projectVersionDetails.cmake | 5 +
src/examples/cpp/CMakeLists.txt | 7 +
src/main/CMakeLists.txt | 10 +
src/main/cpp/CMakeLists.txt | 170 ++
src/main/include/CMakeLists.txt | 117 ++
src/main/include/log4cxx/version_info.h.in | 5 +
src/main/resources/CMakeLists.txt | 7 +
src/main/resources/log4cxx.rc | 9 +-
src/site/apt/building/ant.apt | 229 ---
src/site/apt/building/cmake.apt | 109 ++
src/site/apt/building/maven.apt | 50 +-
src/site/apt/building/vcpkg.apt | 43 +
src/site/apt/building/xcode.apt | 65 -
src/site/site.xml | 11 +-
src/test/CMakeLists.txt | 5 +
src/test/cpp/CMakeLists.txt | 87 +
src/test/cpp/abts.cpp | 834 ++++----
src/test/cpp/abts.h | 75 +-
src/test/cpp/appenderskeletontestcase.cpp | 20 +-
src/test/cpp/appenderskeletontestcase.h | 6 +-
src/test/cpp/asyncappendertestcase.cpp | 488 ++---
src/test/cpp/consoleappendertestcase.cpp | 52 +-
src/test/cpp/customlogger/CMakeLists.txt | 2 +
src/test/cpp/customlogger/xlogger.cpp | 82 +-
src/test/cpp/customlogger/xlogger.h | 184 +-
src/test/cpp/customlogger/xloggertestcase.cpp | 86 +-
src/test/cpp/db/CMakeLists.txt | 3 +
src/test/cpp/db/odbcappendertestcase.cpp | 23 +-
src/test/cpp/decodingtest.cpp | 178 +-
src/test/cpp/defaultinit/CMakeLists.txt | 2 +
src/test/cpp/defaultinit/testcase1.cpp | 46 +-
src/test/cpp/defaultinit/testcase2.cpp | 54 +-
src/test/cpp/defaultinit/testcase3.cpp | 54 +-
src/test/cpp/defaultinit/testcase4.cpp | 56 +-
src/test/cpp/encodingtest.cpp | 298 +--
src/test/cpp/fileappendertest.cpp | 92 +-
src/test/cpp/fileappendertestcase.cpp | 153 +-
src/test/cpp/fileappendertestcase.h | 6 +-
src/test/cpp/filetestcase.cpp | 263 +--
src/test/cpp/filter/CMakeLists.txt | 9 +
src/test/cpp/filter/andfiltertest.cpp | 277 +--
src/test/cpp/filter/denyallfiltertest.cpp | 42 +-
src/test/cpp/filter/levelmatchfiltertest.cpp | 184 +-
src/test/cpp/filter/levelrangefiltertest.cpp | 225 +--
src/test/cpp/filter/loggermatchfiltertest.cpp | 147 +-
src/test/cpp/filter/stringmatchfiltertest.cpp | 186 +-
src/test/cpp/helpers/CMakeLists.txt | 28 +
.../cpp/helpers/absolutetimedateformattestcase.cpp | 276 +--
src/test/cpp/helpers/cacheddateformattestcase.cpp | 1232 ++++++------
src/test/cpp/helpers/charsetdecodertestcase.cpp | 101 +-
src/test/cpp/helpers/charsetencodertestcase.cpp | 532 ++---
src/test/cpp/helpers/cyclicbuffertestcase.cpp | 261 +--
.../cpp/helpers/datetimedateformattestcase.cpp | 327 ++--
src/test/cpp/helpers/filewatchdogtest.cpp | 65 +-
src/test/cpp/helpers/inetaddresstestcase.cpp | 109 +-
src/test/cpp/helpers/iso8601dateformattestcase.cpp | 241 +--
src/test/cpp/helpers/localechanger.cpp | 39 +-
src/test/cpp/helpers/localechanger.h | 70 +-
src/test/cpp/helpers/messagebuffertest.cpp | 292 +--
src/test/cpp/helpers/optionconvertertestcase.cpp | 343 ++--
src/test/cpp/helpers/propertiestestcase.cpp | 449 ++---
.../cpp/helpers/relativetimedateformattestcase.cpp | 82 +-
src/test/cpp/helpers/stringhelpertestcase.cpp | 182 +-
src/test/cpp/helpers/stringtokenizertestcase.cpp | 230 ++-
src/test/cpp/helpers/syslogwritertest.cpp | 23 +-
src/test/cpp/helpers/threadtestcase.cpp | 65 +-
src/test/cpp/helpers/timezonetestcase.cpp | 169 +-
src/test/cpp/helpers/transcodertestcase.cpp | 546 +++---
src/test/cpp/hierarchytest.cpp | 46 +-
src/test/cpp/hierarchythresholdtestcase.cpp | 174 +-
src/test/cpp/insertwide.h | 4 +-
src/test/cpp/jsonlayouttest.cpp | 146 +-
src/test/cpp/l7dtestcase.cpp | 124 +-
src/test/cpp/leveltestcase.cpp | 164 +-
src/test/cpp/loggertestcase.cpp | 819 ++++----
src/test/cpp/logunit.cpp | 346 ++--
src/test/cpp/logunit.h | 403 ++--
src/test/cpp/mdctestcase.cpp | 46 +-
src/test/cpp/minimumtestcase.cpp | 377 ++--
src/test/cpp/ndctestcase.cpp | 138 +-
src/test/cpp/net/CMakeLists.txt | 21 +
src/test/cpp/net/smtpappendertestcase.cpp | 153 +-
src/test/cpp/net/socketappendertestcase.cpp | 23 +-
src/test/cpp/net/sockethubappendertestcase.cpp | 85 +-
src/test/cpp/net/socketserverstarter.cpp | 204 ++
src/test/cpp/net/socketservertestcase.cpp | 787 ++++----
src/test/cpp/net/socketservertestcase.h | 6 +-
src/test/cpp/net/syslogappendertestcase.cpp | 23 +-
src/test/cpp/net/telnetappendertestcase.cpp | 99 +-
src/test/cpp/net/xmlsocketappendertestcase.cpp | 23 +-
src/test/cpp/nt/CMakeLists.txt | 2 +
src/test/cpp/nt/nteventlogappendertestcase.cpp | 126 +-
src/test/cpp/pattern/CMakeLists.txt | 2 +
src/test/cpp/pattern/num343patternconverter.cpp | 18 +-
src/test/cpp/pattern/num343patternconverter.h | 31 +-
src/test/cpp/pattern/patternparsertestcase.cpp | 340 ++--
src/test/cpp/patternlayouttest.cpp | 925 ++++-----
src/test/cpp/propertyconfiguratortest.cpp | 103 +-
src/test/cpp/rolling/CMakeLists.txt | 14 +
src/test/cpp/rolling/filenamepatterntestcase.cpp | 303 +--
src/test/cpp/rolling/filterbasedrollingtest.cpp | 196 +-
src/test/cpp/rolling/manualrollingtest.cpp | 508 ++---
.../obsoletedailyrollingfileappendertest.cpp | 166 +-
.../rolling/obsoleterollingfileappendertest.cpp | 216 +-
src/test/cpp/rolling/sizebasedrollingtest.cpp | 616 +++---
src/test/cpp/rolling/timebasedrollingtest.cpp | 258 +--
src/test/cpp/rollingfileappendertestcase.cpp | 23 +-
src/test/cpp/spi/CMakeLists.txt | 2 +
src/test/cpp/spi/loggingeventtest.cpp | 165 +-
src/test/cpp/streamtestcase.cpp | 1109 ++++++-----
src/test/cpp/testchar.h | 8 +-
src/test/cpp/util/CMakeLists.txt | 21 +
src/test/cpp/util/absolutedateandtimefilter.cpp | 2 +-
src/test/cpp/util/absolutedateandtimefilter.h | 10 +-
src/test/cpp/util/absolutetimefilter.cpp | 2 +-
src/test/cpp/util/absolutetimefilter.h | 10 +-
src/test/cpp/util/binarycompare.cpp | 107 +-
src/test/cpp/util/binarycompare.h | 27 +-
src/test/cpp/util/compare.cpp | 273 +--
src/test/cpp/util/compare.h | 35 +-
src/test/cpp/util/controlfilter.cpp | 2 +-
src/test/cpp/util/controlfilter.h | 12 +-
src/test/cpp/util/filenamefilter.cpp | 33 +-
src/test/cpp/util/filenamefilter.h | 12 +-
src/test/cpp/util/filter.h | 48 +-
src/test/cpp/util/iso8601filter.h | 10 +-
src/test/cpp/util/linenumberfilter.cpp | 4 +-
src/test/cpp/util/linenumberfilter.h | 10 +-
src/test/cpp/util/relativetimefilter.cpp | 4 +-
src/test/cpp/util/relativetimefilter.h | 10 +-
src/test/cpp/util/serializationtesthelper.cpp | 87 +-
src/test/cpp/util/serializationtesthelper.h | 32 +-
src/test/cpp/util/threadfilter.h | 10 +-
src/test/cpp/util/transformer.cpp | 360 ++--
src/test/cpp/util/transformer.h | 50 +-
src/test/cpp/util/utilfilter.cpp | 7 +-
src/test/cpp/util/xmlfilenamefilter.cpp | 13 +-
src/test/cpp/util/xmlfilenamefilter.h | 10 +-
src/test/cpp/util/xmllineattributefilter.cpp | 5 +-
src/test/cpp/util/xmllineattributefilter.h | 10 +-
src/test/cpp/util/xmlthreadfilter.cpp | 3 +-
src/test/cpp/util/xmlthreadfilter.h | 10 +-
src/test/cpp/util/xmltimestampfilter.cpp | 2 +-
src/test/cpp/util/xmltimestampfilter.h | 10 +-
src/test/cpp/varia/CMakeLists.txt | 13 +
src/test/cpp/varia/errorhandlertestcase.cpp | 154 +-
src/test/cpp/varia/levelmatchfiltertestcase.cpp | 225 +--
src/test/cpp/varia/levelrangefiltertestcase.cpp | 412 ++--
src/test/cpp/vectorappender.cpp | 26 +-
src/test/cpp/vectorappender.h | 72 +-
src/test/cpp/writerappendertestcase.cpp | 5 +-
src/test/cpp/writerappendertestcase.h | 6 +-
src/test/cpp/xml/CMakeLists.txt | 9 +
src/test/cpp/xml/customleveltestcase.cpp | 152 +-
src/test/cpp/xml/domtestcase.cpp | 302 +--
src/test/cpp/xml/xlevel.cpp | 71 +-
src/test/cpp/xml/xlevel.h | 70 +-
src/test/cpp/xml/xmllayouttest.cpp | 745 +++----
src/test/cpp/xml/xmllayouttestcase.cpp | 548 +++---
src/test/java/CMakeLists.txt | 33 +
src/test/resources/input/socketServer2.properties | 2 +-
src/test/resources/input/socketServer3.properties | 2 +-
src/test/resources/witness/socketServer.2 | 6 +-
src/test/resources/witness/socketServer.3 | 6 +-
181 files changed, 13411 insertions(+), 16159 deletions(-)
create mode 100644 CMakeLists.txt
delete mode 100755 configure-aprutil.bat
create mode 100644 src/CMakeLists.txt
delete mode 100644 src/ant/apr-build.xml
delete mode 100644 src/ant/apr-util-build.xml
delete mode 100644 src/ant/esmtp-build.xml
delete mode 100644 src/ant/find-apr-util.xml
delete mode 100644 src/ant/find-apr.xml
delete mode 100644 src/ant/find-libesmtp.xml
create mode 100644 src/cmake/FindAPR-Util.cmake
create mode 100644 src/cmake/FindAPR.cmake
create mode 100644 src/cmake/projectVersionDetails.cmake
create mode 100644 src/examples/cpp/CMakeLists.txt
create mode 100644 src/main/CMakeLists.txt
create mode 100644 src/main/cpp/CMakeLists.txt
create mode 100644 src/main/include/CMakeLists.txt
create mode 100644 src/main/include/log4cxx/version_info.h.in
create mode 100644 src/main/resources/CMakeLists.txt
delete mode 100644 src/site/apt/building/ant.apt
create mode 100644 src/site/apt/building/cmake.apt
create mode 100644 src/site/apt/building/vcpkg.apt
delete mode 100644 src/site/apt/building/xcode.apt
create mode 100644 src/test/CMakeLists.txt
create mode 100644 src/test/cpp/CMakeLists.txt
create mode 100644 src/test/cpp/customlogger/CMakeLists.txt
create mode 100644 src/test/cpp/db/CMakeLists.txt
create mode 100644 src/test/cpp/defaultinit/CMakeLists.txt
create mode 100644 src/test/cpp/filter/CMakeLists.txt
create mode 100644 src/test/cpp/helpers/CMakeLists.txt
create mode 100644 src/test/cpp/net/CMakeLists.txt
create mode 100644 src/test/cpp/net/socketserverstarter.cpp
create mode 100644 src/test/cpp/nt/CMakeLists.txt
create mode 100644 src/test/cpp/pattern/CMakeLists.txt
create mode 100644 src/test/cpp/rolling/CMakeLists.txt
create mode 100644 src/test/cpp/spi/CMakeLists.txt
create mode 100644 src/test/cpp/util/CMakeLists.txt
create mode 100644 src/test/cpp/varia/CMakeLists.txt
create mode 100644 src/test/cpp/xml/CMakeLists.txt
create mode 100644 src/test/java/CMakeLists.txt