You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rm...@apache.org on 2022/01/09 16:24:18 UTC
[logging-log4cxx] branch next_stable updated (849e9eb -> 60a9812)
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a change to branch next_stable
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git.
from 849e9eb Merge branch 'swebb2066-next_wchar_throughputtests' into next_stable
add d354ea5 Save abi compliance check (#98)
add 2584214 Add short filename to location info (#95)
add 6a6be61 [LOG4CXX-548] Reproducible Doxygen doc generation (#99)
add e4ba93b Update log4cxx.h.in (#86)
add c4b7dc9 Update copyright date
add f06575f updated mapfilter to have license information
add 6f81004 Added copyright information to cmake files
new 60a9812 Merge branch 'master' into next_stable
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/abi-compatibility.yml | 10 +++-
CMakeLists.txt | 16 +++++++
src/CMakeLists.txt | 16 +++++++
src/examples/cpp/CMakeLists.txt | 17 +++++++
src/main/CMakeLists.txt | 16 +++++++
src/main/cpp-qt/CMakeLists.txt | 17 +++++++
src/main/cpp-qt/messagehandler.cpp | 5 +-
src/main/cpp/CMakeLists.txt | 21 +++++++-
src/main/cpp/class.cpp | 5 ++
src/main/cpp/locationinfo.cpp | 8 ++++
src/main/cpp/patternlayout.cpp | 3 ++
...r.cpp => shortfilelocationpatternconverter.cpp} | 34 ++++++-------
src/main/include/CMakeLists.txt | 17 +++++++
src/main/include/log4cxx/log4cxx.h.in | 23 +++++++--
...erter.h => shortfilelocationpatternconverter.h} | 12 ++---
src/main/include/log4cxx/patternlayout.h | 6 +++
.../include/log4cxx/spi/location/locationinfo.h | 52 ++++++++++++++++++--
src/main/resources/CMakeLists.txt | 17 +++++++
src/site/CMakeLists.txt | 44 ++++++++++++-----
src/site/doxy/Doxyfile.in | 18 +++----
src/site/doxy/footer.html | 2 +-
src/site/markdown/filters/MapFilter.md | 23 ++++++++-
src/site/markdown/usage.md | 10 ++++
src/test/CMakeLists.txt | 17 +++++++
src/test/cpp/CMakeLists.txt | 21 +++++++-
src/test/cpp/customlogger/CMakeLists.txt | 17 +++++++
src/test/cpp/defaultinit/CMakeLists.txt | 17 +++++++
src/test/cpp/filter/CMakeLists.txt | 17 +++++++
src/test/cpp/helpers/CMakeLists.txt | 17 +++++++
src/test/cpp/jsonlayouttest.cpp | 8 ++--
.../{mdctestcase.cpp => locationdisabledtest.cpp} | 56 ++++++++++++----------
src/test/cpp/{mdctestcase.cpp => locationtest.cpp} | 56 ++++++++++++----------
src/test/cpp/net/CMakeLists.txt | 16 +++++++
src/test/cpp/pattern/CMakeLists.txt | 17 +++++++
src/test/cpp/patternlayouttest.cpp | 8 ++++
src/test/cpp/rolling/CMakeLists.txt | 17 +++++++
src/test/cpp/rolling/timebasedrollingtest.cpp | 2 +
src/test/cpp/throughput/CMakeLists.txt | 19 ++++++++
src/test/cpp/util/CMakeLists.txt | 17 +++++++
src/test/cpp/varia/CMakeLists.txt | 17 +++++++
src/test/cpp/xml/CMakeLists.txt | 17 +++++++
src/test/java/CMakeLists.txt | 17 +++++++
...ernLayout13.properties => location1.properties} | 6 +--
...ut12.properties => locationdisabled.properties} | 4 +-
...mdc.1.properties => patternLayout14.properties} | 4 +-
src/test/resources/witness/location1-disabled | 1 +
src/test/resources/witness/location1-good | 1 +
src/test/resources/witness/patternLayout.14 | 10 ++++
48 files changed, 670 insertions(+), 121 deletions(-)
copy src/main/cpp/{filelocationpatternconverter.cpp => shortfilelocationpatternconverter.cpp} (57%)
copy src/main/include/log4cxx/pattern/{filelocationpatternconverter.h => shortfilelocationpatternconverter.h} (82%)
copy src/test/cpp/{mdctestcase.cpp => locationdisabledtest.cpp} (59%)
copy src/test/cpp/{mdctestcase.cpp => locationtest.cpp} (60%)
copy src/test/resources/input/{patternLayout13.properties => location1.properties} (88%)
copy src/test/resources/input/{patternLayout12.properties => locationdisabled.properties} (87%)
copy src/test/resources/input/{patternLayout.mdc.1.properties => patternLayout14.properties} (93%)
create mode 100644 src/test/resources/witness/location1-disabled
create mode 100644 src/test/resources/witness/location1-good
create mode 100644 src/test/resources/witness/patternLayout.14
[logging-log4cxx] 01/01: Merge branch 'master' into next_stable
Posted by rm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rmiddleton pushed a commit to branch next_stable
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit 60a98129a31b238d8cbef239cf32d7d076bb450b
Merge: 849e9eb 6f81004
Author: Robert Middleton <ro...@rm5248.com>
AuthorDate: Sun Jan 9 11:24:08 2022 -0500
Merge branch 'master' into next_stable
.github/workflows/abi-compatibility.yml | 10 ++-
CMakeLists.txt | 16 +++++
src/CMakeLists.txt | 16 +++++
src/examples/cpp/CMakeLists.txt | 17 +++++
src/main/CMakeLists.txt | 16 +++++
src/main/cpp-qt/CMakeLists.txt | 17 +++++
src/main/cpp-qt/messagehandler.cpp | 5 +-
src/main/cpp/CMakeLists.txt | 21 +++++-
src/main/cpp/class.cpp | 5 ++
src/main/cpp/locationinfo.cpp | 8 +++
src/main/cpp/patternlayout.cpp | 3 +
src/main/cpp/shortfilelocationpatternconverter.cpp | 49 ++++++++++++++
src/main/include/CMakeLists.txt | 17 +++++
src/main/include/log4cxx/log4cxx.h.in | 23 ++++++-
.../pattern/shortfilelocationpatternconverter.h | 67 +++++++++++++++++++
src/main/include/log4cxx/patternlayout.h | 6 ++
.../include/log4cxx/spi/location/locationinfo.h | 52 +++++++++++++--
src/main/resources/CMakeLists.txt | 17 +++++
src/site/CMakeLists.txt | 44 +++++++++----
src/site/doxy/Doxyfile.in | 18 +++---
src/site/doxy/footer.html | 2 +-
src/site/markdown/filters/MapFilter.md | 23 ++++++-
src/site/markdown/usage.md | 10 +++
src/test/CMakeLists.txt | 17 +++++
src/test/cpp/CMakeLists.txt | 21 +++++-
src/test/cpp/customlogger/CMakeLists.txt | 17 +++++
src/test/cpp/defaultinit/CMakeLists.txt | 17 +++++
src/test/cpp/filter/CMakeLists.txt | 17 +++++
src/test/cpp/helpers/CMakeLists.txt | 17 +++++
src/test/cpp/jsonlayouttest.cpp | 8 +--
src/test/cpp/locationdisabledtest.cpp | 75 ++++++++++++++++++++++
src/test/cpp/locationtest.cpp | 75 ++++++++++++++++++++++
src/test/cpp/net/CMakeLists.txt | 16 +++++
src/test/cpp/pattern/CMakeLists.txt | 17 +++++
src/test/cpp/patternlayouttest.cpp | 8 +++
src/test/cpp/rolling/CMakeLists.txt | 17 +++++
src/test/cpp/rolling/timebasedrollingtest.cpp | 2 +
src/test/cpp/throughput/CMakeLists.txt | 19 ++++++
src/test/cpp/util/CMakeLists.txt | 17 +++++
src/test/cpp/varia/CMakeLists.txt | 17 +++++
src/test/cpp/xml/CMakeLists.txt | 17 +++++
src/test/java/CMakeLists.txt | 17 +++++
src/test/resources/input/location1.properties | 21 ++++++
.../resources/input/locationdisabled.properties | 21 ++++++
.../resources/input/patternLayout14.properties | 21 ++++++
src/test/resources/witness/location1-disabled | 1 +
src/test/resources/witness/location1-good | 1 +
src/test/resources/witness/patternLayout.14 | 10 +++
48 files changed, 907 insertions(+), 41 deletions(-)
diff --cc src/test/cpp/util/CMakeLists.txt
index 35cd3eb,edfe47a..0262053
--- a/src/test/cpp/util/CMakeLists.txt
+++ b/src/test/cpp/util/CMakeLists.txt
@@@ -1,5 -1,23 +1,22 @@@
+ #
+ # Licensed to the Apache Software Foundation (ASF) under one or more
+ # contributor license agreements. See the NOTICE file distributed with
+ # this work for additional information regarding copyright ownership.
+ # The ASF licenses this file to You under the Apache License, Version 2.0
+ # (the "License"); you may not use this file except in compliance with
+ # the License. You may obtain a copy of the License at
+ #
+ # http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or agreed to in writing, software
+ # distributed under the License is distributed on an "AS IS" BASIS,
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ #
+
# Components required by all tests
add_library(testingUtilities STATIC
- serializationtesthelper.cpp
absolutedateandtimefilter.cpp
absolutetimefilter.cpp
binarycompare.cpp