You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2024/01/15 14:51:53 UTC
(logging-log4j2) branch main updated (2d9774c759 -> c71bdf8f6a)
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from 2d9774c759 Fix location-based tests
add 613627b920 Remove unused fields
add 37faed2866 [LOG4J2-2557] Remove recursion between Logger and LoggerRepository
add 9def6aad21 Fix Spotbugs alerts up to rank 9
add f5e2675778 [LOG4J2-3483] Adds support for Apache Extras RollingFileAppender
add a89e0d354f Add `final` where possible
add a2f7b94c13 [LOG4J2-3534] Fix LevelRangeFilterBuilder to align with log4j1's behavior (#924)
add 3c3b895df4 Remove unused variable
add 39a3fcf68a Removes additional default configurations
add c71bdf8f6a Port `log4j-1.2-api` changes from `2.x`
No new revisions were added by this update.
Summary of changes:
log4j-1.2-api/pom.xml | 8 +-
.../src/main/java/org/apache/log4j/Category.java | 43 +--
.../src/main/java/org/apache/log4j/Hierarchy.java | 22 +-
.../main/java/org/apache/log4j/WriterAppender.java | 9 +-
.../org/apache/log4j/builders/AbstractBuilder.java | 33 +++
.../org/apache/log4j/builders/BuilderManager.java | 14 +-
.../EnhancedRollingFileAppenderBuilder.java | 295 +++++++++++++++++++++
.../appender/RollingFileAppenderBuilder.java | 6 -
.../builders/filter/LevelRangeFilterBuilder.java | 18 +-
.../log4j/builders/layout/XmlLayoutBuilder.java | 10 +-
.../rolling/CompositeTriggeringPolicyBuilder.java | 75 ++++++
.../rolling/SizeBasedTriggeringPolicyBuilder.java | 76 ++++++
.../TimeBasedRollingPolicyBuilder.java} | 43 +--
.../TriggeringPolicyBuilder.java} | 11 +-
.../log4j/config/PropertiesConfiguration.java | 9 +
.../org/apache/log4j/helpers/OptionConverter.java | 2 +-
.../org/apache/log4j/layout/Log4j1XmlLayout.java | 2 +-
.../log4j/pattern/Log4j1LevelPatternConverter.java | 2 +-
.../java/org/apache/log4j/spi/LocationInfo.java | 18 +-
.../org/apache/log4j/xml/XmlConfiguration.java | 7 +
.../test/java/org/apache/log4j/CategoryTest.java | 1 +
.../filter/LevelRangeFilterBuilderTest.java | 209 +++++++++++++++
.../config/AbstractLog4j1ConfigurationTest.java | 104 ++++++++
.../log4j/config/PropertiesConfigurationTest.java | 53 +++-
.../apache/log4j/config/XmlConfigurationTest.java | 33 ++-
.../src/test/resources/LOG4J2-3326.properties | 5 +-
.../log4j-EnhancedRollingFileAppender.properties | 65 +++++
.../log4j-EnhancedRollingFileAppender.xml | 94 +++++++
...roperties => log4j-LevelRangeFilter.properties} | 5 +-
...SimpleLayout.xml => log4j-LevelRangeFilter.xml} | 18 +-
.../log4j/core/filter/LevelRangeFilter.java | 6 -
31 files changed, 1155 insertions(+), 141 deletions(-)
create mode 100644 log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/EnhancedRollingFileAppenderBuilder.java
create mode 100644 log4j-1.2-api/src/main/java/org/apache/log4j/builders/rolling/CompositeTriggeringPolicyBuilder.java
create mode 100644 log4j-1.2-api/src/main/java/org/apache/log4j/builders/rolling/SizeBasedTriggeringPolicyBuilder.java
copy log4j-1.2-api/src/main/java/org/apache/log4j/builders/{appender/NullAppenderBuilder.java => rolling/TimeBasedRollingPolicyBuilder.java} (53%)
copy log4j-1.2-api/src/main/java/org/apache/log4j/builders/{layout/LayoutBuilder.java => rolling/TriggeringPolicyBuilder.java} (80%)
create mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/builders/filter/LevelRangeFilterBuilderTest.java
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/log4j-EnhancedRollingFileAppender.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/log4j-EnhancedRollingFileAppender.xml
copy log4j-1.2-api/src/test/resources/config-1.2/{log4j-global-threshold.properties => log4j-LevelRangeFilter.properties} (80%)
copy log4j-1.2-api/src/test/resources/config-1.2/{log4j-console-SimpleLayout.xml => log4j-LevelRangeFilter.xml} (74%)