This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
from 266481d Refactor remaining use of PluginUtil
new 3e88da0 Merge catch clauses.
new a24fd88 Remove unused method.
new 38d4392 Allow for whitespace in property files.
new 5fc7561 Javadoc.
new 21fbb01 Remove unused imports.
new d927dc1 Comment empty block.
new c5caf6f Format nits.
new fedffa5 Javadoc and add toString().
new 1c5b7ef Internal refactoring.
new 800df3d Fill basic support in DOMConfigurator except for DOM-based
APIs.
new 2ec24cf Internal refactoring.
new a7d8b07 Log4j 1.2 bridge internal refactoring adds
getBooleanValueAttribute().
new 45c53f9 [LOG4J2-3410] Log4j 1.2 bridge throws a ClassCastException
when logging a Map with non-String keys.
new e0dee73 LOG4J2-3407 Check for non-existent appender when parsing
properties (#761)
new 3444791 Adds Log4j 1.x global threshold (#764)
The 15 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:
log4j-1.2-api/pom.xml | 11 +
.../java/org/apache/log4j/RollingFileAppender.java | 8 +-
.../main/java/org/apache/log4j/WriterAppender.java | 10 +-
.../org/apache/log4j/bridge/AppenderAdapter.java | 2 -
.../org/apache/log4j/bridge/LayoutAdapter.java | 6 +-
.../org/apache/log4j/bridge/LayoutWrapper.java | 19 +-
.../org/apache/log4j/bridge/LogEventAdapter.java | 8 +-
.../org/apache/log4j/bridge/LogEventWrapper.java | 8 +-
.../apache/log4j/bridge/RewritePolicyWrapper.java | 2 +-
.../org/apache/log4j/builders/AbstractBuilder.java | 8 +-
.../java/org/apache/log4j/builders/Builder.java | 6 +-
.../org/apache/log4j/builders/BuilderManager.java | 149 +++----
.../{appender/AppenderBuilder.java => Parser.java} | 31 +-
.../log4j/builders/appender/AppenderBuilder.java | 8 +-
.../builders/appender/ConsoleAppenderBuilder.java | 2 -
.../builders/appender/RewriteAppenderBuilder.java | 3 +-
.../builders/appender/SocketAppenderBuilder.java | 2 -
.../builders/filter/DenyAllFilterBuilder.java | 4 +-
.../log4j/builders/filter/FilterBuilder.java | 13 +-
.../builders/filter/LevelMatchFilterBuilder.java | 8 +-
.../builders/filter/LevelRangeFilterBuilder.java | 8 +-
.../builders/filter/StringMatchFilterBuilder.java | 8 +-
.../log4j/builders/layout/HtmlLayoutBuilder.java | 8 +-
.../log4j/builders/layout/LayoutBuilder.java | 12 +-
.../builders/layout/PatternLayoutBuilder.java | 16 +-
.../log4j/builders/layout/SimpleLayoutBuilder.java | 4 +-
.../log4j/builders/layout/TTCCLayoutBuilder.java | 12 +-
.../log4j/builders/layout/XmlLayoutBuilder.java | 10 +-
.../builders/rewrite/RewritePolicyBuilder.java | 12 +-
.../log4j/config/Log4j1ConfigurationParser.java | 28 +-
.../log4j/config/PropertiesConfiguration.java | 20 +-
.../org/apache/log4j/helpers/OptionConverter.java | 1 -
.../org/apache/log4j/helpers/PatternParser.java | 9 +-
.../java/org/apache/log4j/helpers/QuietWriter.java | 6 +-
.../org/apache/log4j/or/jms/MessageRenderer.java | 87 ++++
.../log4j/pattern/Log4j1NdcPatternConverter.java | 4 +-
.../org/apache/log4j/rewrite/MapRewritePolicy.java | 6 +-
.../log4j/rewrite/PropertyRewritePolicy.java | 10 +-
.../org/apache/log4j/spi/AppenderAttachable.java | 4 +-
.../java/org/apache/log4j/spi/LocationInfo.java | 8 +-
.../java/org/apache/log4j/xml/DOMConfigurator.java | 113 ++++-
.../log4j/xml/UnrecognizedElementHandler.java | 3 +-
.../java/org/apache/log4j/xml/XMLWatchdog.java | 29 +-
.../org/apache/log4j/xml/XmlConfiguration.java | 73 ++--
.../src/test/java/org/apache/log4j/LevelTest.java | 5 +-
.../test/java/org/apache/log4j/ListAppender.java | 4 +-
.../test/java/org/apache/log4j/LogWithMDCTest.java | 11 +-
.../java/org/apache/log4j/LogWithRouteTest.java | 10 +-
.../java/org/apache/log4j/LoggerJira3410Test.java | 82 ++++
.../src/test/java/org/apache/log4j/LoggerTest.java | 17 +-
.../test/java/org/apache/log4j/LoggingTest.java | 6 +-
.../test/java/org/apache/log4j/PriorityTest.java | 6 +-
.../apache/log4j/bridge/LogEventWrapperTest.java | 6 +-
.../log4j/builders/Log4j2ListAppenderBuilder.java | 4 -
.../config/AbstractLog4j1ConfigurationTest.java | 31 +-
.../config/Log4j1ConfigurationFactoryTest.java | 39 ++
.../log4j/config/PropertiesConfigurationTest.java | 68 ++-
.../org/apache/log4j/config/TestConfigurator.java | 2 +-
.../apache/log4j/config/XmlConfigurationTest.java | 47 +-
.../org/apache/log4j/helpers/DateLayoutTest.java | 11 +-
.../apache/log4j/helpers/UtilLoggingLevelTest.java | 2 +-
.../pattern/Log4j1NdcPatternConverterTest.java | 4 +-
.../log4j/util/AbsoluteDateAndTimeFilter.java | 24 +-
.../org/apache/log4j/util/AbsoluteTimeFilter.java | 23 +-
.../java/org/apache/log4j/util/ControlFilter.java | 47 ++
.../log4j/util/EnhancedJunitTestRunnerFilter.java | 58 +++
.../log4j/util/EnhancedLineNumberFilter.java} | 36 +-
.../UtilLoggingLevelTest.java => util/Filter.java} | 32 +-
.../java/org/apache/log4j/util/ISO8601Filter.java | 23 +-
.../apache/log4j/util/JunitTestRunnerFilter.java | 54 +++
.../org/apache/log4j/util/LineNumberFilter.java | 24 +-
.../org/apache/log4j/util/RelativeTimeFilter.java | 24 +-
.../apache/log4j/util/SerializationTestHelper.java | 118 +++--
.../org/apache/log4j/util/SunReflectFilter.java} | 41 +-
.../java/org/apache/log4j/util/Transformer.java | 59 +++
.../log4j/util/UnexpectedFormatException.java} | 12 +-
.../apache/log4j/util/XMLLineAttributeFilter.java} | 20 +-
.../org/apache/log4j/util/XMLTimestampFilter.java} | 17 +-
.../java/org/apache/log4j/xml/DOMTestCase.java | 473 +++++++++++++++++++++
...G4J2-3247.properties => LOG4J2-3407.properties} | 12 +-
.../log4j-global-threshold.properties} | 5 +-
...NullAppender.xml => log4j-global-threshold.xml} | 8 +-
...ender.properties => log4j-untrimmed.properties} | 14 +-
.../log4j1-1.2.17/input/xml/DOMTestCase1.xml | 4 +-
.../log4j/util/SortedArrayStringMapTest.java | 22 +-
.../logging/log4j/util/SortedArrayStringMap.java | 5 +-
src/changes/changes.xml | 3 +
87 files changed, 1677 insertions(+), 635 deletions(-)
copy
log4j-1.2-api/src/main/java/org/apache/log4j/builders/{appender/AppenderBuilder.java
=> Parser.java} (62%)
create mode 100644
log4j-1.2-api/src/main/java/org/apache/log4j/or/jms/MessageRenderer.java
copy
log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/LaxHostnameVerifier.java
=> log4j-1.2-api/src/main/java/org/apache/log4j/xml/XMLWatchdog.java (62%)
create mode 100644
log4j-1.2-api/src/test/java/org/apache/log4j/LoggerJira3410Test.java
copy
log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Base64StrLookup.java
=>
log4j-1.2-api/src/test/java/org/apache/log4j/util/AbsoluteDateAndTimeFilter.java
(64%)
copy
log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Base64StrLookup.java
=> log4j-1.2-api/src/test/java/org/apache/log4j/util/AbsoluteTimeFilter.java
(66%)
create mode 100644
log4j-1.2-api/src/test/java/org/apache/log4j/util/ControlFilter.java
create mode 100644
log4j-1.2-api/src/test/java/org/apache/log4j/util/EnhancedJunitTestRunnerFilter.java
copy log4j-1.2-api/src/{main/java/org/apache/log4j/CategoryKey.java =>
test/java/org/apache/log4j/util/EnhancedLineNumberFilter.java} (56%)
copy
log4j-1.2-api/src/test/java/org/apache/log4j/{helpers/UtilLoggingLevelTest.java
=> util/Filter.java} (56%)
copy
log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Base64StrLookup.java
=> log4j-1.2-api/src/test/java/org/apache/log4j/util/ISO8601Filter.java (68%)
create mode 100644
log4j-1.2-api/src/test/java/org/apache/log4j/util/JunitTestRunnerFilter.java
copy
log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Base64StrLookup.java
=> log4j-1.2-api/src/test/java/org/apache/log4j/util/LineNumberFilter.java
(63%)
copy
log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Base64StrLookup.java
=> log4j-1.2-api/src/test/java/org/apache/log4j/util/RelativeTimeFilter.java
(62%)
copy log4j-1.2-api/src/{main/java/org/apache/log4j/CategoryKey.java =>
test/java/org/apache/log4j/util/SunReflectFilter.java} (51%)
create mode 100644
log4j-1.2-api/src/test/java/org/apache/log4j/util/Transformer.java
copy log4j-1.2-api/src/{main/java/org/apache/log4j/ProvisionNode.java =>
test/java/org/apache/log4j/util/UnexpectedFormatException.java} (76%)
copy
log4j-1.2-api/src/{main/java/org/apache/log4j/spi/DefaultRepositorySelector.java
=> test/java/org/apache/log4j/util/XMLLineAttributeFilter.java} (61%)
copy
log4j-1.2-api/src/{main/java/org/apache/log4j/spi/DefaultRepositorySelector.java
=> test/java/org/apache/log4j/util/XMLTimestampFilter.java} (68%)
create mode 100644
log4j-1.2-api/src/test/java/org/apache/log4j/xml/DOMTestCase.java
copy log4j-1.2-api/src/test/resources/{LOG4J2-3247.properties =>
LOG4J2-3407.properties} (71%)
copy log4j-1.2-api/src/test/resources/{L7D_fr_CH.properties =>
config-1.2/log4j-global-threshold.properties} (88%)
copy log4j-1.2-api/src/test/resources/config-1.2/{log4j-NullAppender.xml =>
log4j-global-threshold.xml} (86%)
copy
log4j-1.2-api/src/test/resources/config-1.2/{log4j-NullAppender.properties =>
log4j-untrimmed.properties} (68%)
