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 d324045 Fix OSGI tests
new c2772ae [LOG4J2-3423] JAR file containing Log4j configuration isn't
closed.
new b0e977f Provide a uniform Log4j 1.x message factory
new dcd648e Improves behavior of failing Log4j 1.x builders
new 1d97bcd Add disabled but failing tests from Log4j 1 as TODOs.
new 30f527e [LOG4J2-3426] Refactors wrapping code
new 9fcb3c0 [LOG4J2-3423] Refactoring of URLConnection code
new 37c3e8b Tests that configuring and reconfiguring STOCK and CUSTOM
appenders properly pick up different settings.
new aef4301 [LOG4J2-3419] Adds support for custom Log4j 1.x levels (#789)
new 4c63bbf [LOG4J2-3419] Add a Log4j 1.x level name pattern converter
new e445cc5 Fix code typo in ThrowableInformation of log4j-1.2-api.
new e7ff9df Add missing package for binary compatibility
new c44d7e8 [LOG4J2-3419] Allows %pid in Log4j 1.x patterns
new 8f89a6f [LOG4J2-3447] Fixes native Log4j1 appenders concurrency
problems
new 31c823e Fix compilation and tests
new 37e3c1f Another OSGI fix
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 | 10 +
.../java/org/apache/log4j/AppenderSkeleton.java | 2 +-
.../src/main/java/org/apache/log4j/Category.java | 63 +-
.../src/main/java/org/apache/log4j/Hierarchy.java | 3 +-
.../src/main/java/org/apache/log4j/Level.java | 26 +-
.../src/main/java/org/apache/log4j/Priority.java | 9 +
.../org/apache/log4j/PropertyConfigurator.java | 7 +-
.../org/apache/log4j/bridge/AppenderAdapter.java | 26 +-
.../org/apache/log4j/bridge/AppenderWrapper.java | 28 +-
.../org/apache/log4j/bridge/FilterAdapter.java | 25 +-
.../org/apache/log4j/bridge/FilterWrapper.java | 21 +
.../org/apache/log4j/bridge/LayoutAdapter.java | 24 +-
.../org/apache/log4j/bridge/LayoutWrapper.java | 18 +
.../org/apache/log4j/bridge/LogEventAdapter.java | 21 +-
.../org/apache/log4j/builders/AbstractBuilder.java | 2 +-
.../org/apache/log4j/builders/BuilderManager.java | 48 +-
.../builders/appender/AsyncAppenderBuilder.java | 12 +-
.../builders/appender/ConsoleAppenderBuilder.java | 9 +-
.../appender/DailyRollingFileAppenderBuilder.java | 11 +-
.../builders/appender/FileAppenderBuilder.java | 11 +-
.../builders/appender/NullAppenderBuilder.java | 4 +-
.../builders/appender/RewriteAppenderBuilder.java | 14 +-
.../appender/RollingFileAppenderBuilder.java | 11 +-
.../builders/appender/SocketAppenderBuilder.java | 9 +-
.../builders/appender/SyslogAppenderBuilder.java | 10 +-
.../builders/filter/LevelMatchFilterBuilder.java | 5 +-
.../builders/filter/LevelRangeFilterBuilder.java | 7 +-
.../builders/filter/StringMatchFilterBuilder.java | 13 +-
.../log4j/builders/layout/HtmlLayoutBuilder.java | 2 +-
.../builders/layout/PatternLayoutBuilder.java | 10 +-
.../log4j/builders/layout/SimpleLayoutBuilder.java | 4 +-
.../log4j/builders/layout/TTCCLayoutBuilder.java | 2 +-
.../log4j/builders/layout/XmlLayoutBuilder.java | 2 +-
.../apache/log4j/config/Log4j1Configuration.java | 7 +
.../log4j/config/Log4j1ConfigurationParser.java | 30 +-
.../log4j/config/PropertiesConfiguration.java | 17 +-
.../org/apache/log4j/config/PropertySetter.java | 2 +-
.../org/apache/log4j/helpers/OptionConverter.java | 244 +-
.../org/apache/log4j/helpers/UtilLoggingLevel.java | 2 +-
.../org/apache/log4j/jmx/AbstractDynamicMBean.java | 177 +
.../src/main/java/org/apache/log4j/jmx/Agent.java | 131 +
.../org/apache/log4j/jmx/AppenderDynamicMBean.java | 280 +
.../apache/log4j/jmx/HierarchyDynamicMBean.java | 252 +
.../org/apache/log4j/jmx/LayoutDynamicMBean.java | 216 +
.../org/apache/log4j/jmx/LoggerDynamicMBean.java | 227 +
.../MethodUnion.java} | 17 +-
.../org/apache/log4j/{ => jmx}/package-info.java | 4 +-
...erter.java => Log4j1LevelPatternConverter.java} | 45 +-
.../org/apache/log4j/spi/ThrowableInformation.java | 2 +-
.../java/org/apache/log4j/xml/DOMConfigurator.java | 4 +-
.../org/apache/log4j/xml/XmlConfiguration.java | 25 +-
.../test/java/org/apache/log4j/CategoryTest.java | 56 +-
...omNoopAppender.java => CustomFileAppender.java} | 33 +-
.../java/org/apache/log4j/CustomNoopAppender.java | 34 +-
.../apache/log4j/builders/BuilderManagerTest.java | 54 +
.../log4j/builders/Log4j2ListAppenderBuilder.java | 9 +-
.../builders/layout/PatternLayoutBuilderTest.java | 57 +
.../config/AbstractLog4j1ConfigurationTest.java | 10 +-
.../config/Log4j1ConfigurationFactoryTest.java | 2 +-
.../config/PropertiesConfigurationFactoryTest.java | 2 +-
.../log4j/config/PropertiesConfigurationTest.java | 4 +-
.../config/PropertiesReconfigurationTest.java | 233 +-
.../TestCase1.java} | 56 +-
.../org/apache/log4j/defaultInit/TestCase2.java | 59 +
.../org/apache/log4j/defaultInit/TestCase3.java | 53 +
.../org/apache/log4j/defaultInit/TestCase4.java | 60 +
.../log4j/helpers/OptionConverterLevelTest.java | 123 +
.../apache/log4j/helpers/UtilLoggingLevelTest.java | 36 +-
.../pattern/Log4j1LevelPatternConverterTest.java | 42 +-
...erties => log4j1-appenders-custom-1.properties} | 17 +-
...erties => log4j1-appenders-custom-2.properties} | 17 +-
...j1-file.properties => log4j1-file-1.properties} | 3 +
...j1-file.properties => log4j1-file-2.properties} | 8 +-
.../log4j/core/config/ConfigurationSourceTest.java | 48 +-
.../log4j/core/net/UrlConnectionFactoryTest.java | 83 +-
.../log4j/core/selector/TestClassLoader.java | 8 +-
.../logging/log4j/core/util/NetUtilsTest.java | 18 +-
log4j-core-test/src/test/resources/jarfile.jar | Bin 0 -> 1122 bytes
.../config/console.xml} | 7 +-
.../log4j/core/config/ConfigurationFactory.java | 43 +-
.../log4j/core/config/ConfigurationSource.java | 12 +-
.../core/config/DefaultConfigurationFactory.java | 4 -
.../logging/log4j/core/config/HttpWatcher.java | 2 +
.../log4j/core/net/UrlConnectionFactory.java | 17 +-
.../boot/Log4j2CloudConfigLoggingSystem.java | 2 +
src/changes/changes.xml | 3 +
updates.txt | 7424 ++++++++++++++++++++
87 files changed, 10222 insertions(+), 568 deletions(-)
create mode 100644
log4j-1.2-api/src/main/java/org/apache/log4j/jmx/AbstractDynamicMBean.java
create mode 100644 log4j-1.2-api/src/main/java/org/apache/log4j/jmx/Agent.java
create mode 100644
log4j-1.2-api/src/main/java/org/apache/log4j/jmx/AppenderDynamicMBean.java
create mode 100644
log4j-1.2-api/src/main/java/org/apache/log4j/jmx/HierarchyDynamicMBean.java
create mode 100644
log4j-1.2-api/src/main/java/org/apache/log4j/jmx/LayoutDynamicMBean.java
create mode 100644
log4j-1.2-api/src/main/java/org/apache/log4j/jmx/LoggerDynamicMBean.java
copy log4j-1.2-api/src/main/java/org/apache/log4j/{DefaultCategoryFactory.java
=> jmx/MethodUnion.java} (74%)
copy log4j-1.2-api/src/main/java/org/apache/log4j/{ => jmx}/package-info.java
(85%)
copy
log4j-1.2-api/src/main/java/org/apache/log4j/pattern/{Log4j1NdcPatternConverter.java
=> Log4j1LevelPatternConverter.java} (54%)
copy log4j-1.2-api/src/test/java/org/apache/log4j/{CustomNoopAppender.java =>
CustomFileAppender.java} (60%)
create mode 100644
log4j-1.2-api/src/test/java/org/apache/log4j/builders/BuilderManagerTest.java
create mode 100644
log4j-1.2-api/src/test/java/org/apache/log4j/builders/layout/PatternLayoutBuilderTest.java
copy
log4j-1.2-api/src/test/java/org/apache/log4j/{helpers/UtilLoggingLevelTest.java
=> defaultInit/TestCase1.java} (54%)
create mode 100644
log4j-1.2-api/src/test/java/org/apache/log4j/defaultInit/TestCase2.java
create mode 100644
log4j-1.2-api/src/test/java/org/apache/log4j/defaultInit/TestCase3.java
create mode 100644
log4j-1.2-api/src/test/java/org/apache/log4j/defaultInit/TestCase4.java
create mode 100644
log4j-1.2-api/src/test/java/org/apache/log4j/helpers/OptionConverterLevelTest.java
copy
log4j-api-test/src/test/java/org/apache/logging/log4j/util/PropertySourceCamelCaseTest.java
=>
log4j-1.2-api/src/test/java/org/apache/log4j/pattern/Log4j1LevelPatternConverterTest.java
(51%)
copy log4j-1.2-api/src/test/resources/{log4j1-file.properties =>
log4j1-appenders-custom-1.properties} (81%)
copy log4j-1.2-api/src/test/resources/{log4j1-file.properties =>
log4j1-appenders-custom-2.properties} (81%)
copy log4j-1.2-api/src/test/resources/{log4j1-file.properties =>
log4j1-file-1.properties} (99%)
rename log4j-1.2-api/src/test/resources/{log4j1-file.properties =>
log4j1-file-2.properties} (89%)
create mode 100644 log4j-core-test/src/test/resources/jarfile.jar
copy log4j-core-test/src/test/resources/{log4j2-console-xex-ansi.xml =>
jarfile/config/console.xml} (80%)
create mode 100644 updates.txt
