This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a change to branch mean-bean-machine
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
from 20f23a7 Remove redundant instanceof
new 5031dd6 Remove unneeded methods
new 0770786 Specify targets for scopes
new 7f8995b Rearrange code for clarity
new 4e7b905 Extract ProviderFactory interface
add d2b327c LOG4J2-2805 - TimeFilter did not handle daylight saving time
transitions and did not support a range over 2 days.
add a23aacf LOG4J2-2807 - Add EventLookup to retrieve fields from the log
event
add 0b87b3a avoid NPE because the stacklocator returned null (#356)
add dc1889f Avoid NullPointerException when StackWalker returns null.
add 0f79592 LOG4J2-2761: Fix FileUtils#fileFromUri to works correctly
with SecurityManager and also fix URI parsing to behave sane with standards
add 7954725 Fix another case of incorrect URI/URL parsing (making test
fail on windows with whitespace in filename)
add 5e268fb LOG4J2-2761: For absolute URIs don't fail on wrongly
formatted file URIs
add 172ffa4 LOG4J2-2761: Fix case when relative file does not exist
add f08cab1 Merge branch 'jira/LOG4J2-2761' of
https://github.com/uschindler/logging-log4j2 into uschindler-jira/LOG4J2-2761
add a0880bb LOG4J2-2761 - Fix Exceptions when whitespace is in the file
path and Java security manager is used.
add 022bb15 Merge branch 'uschindler-jira/LOG4J2-2761'
new 5c2aa2f Merge branch 'master' into mean-bean-machine
new 5ae774a Inline Qualifiers
new 65e0d87 Remove unused class
add 3f2f0d3 Adding target to Console appender (#354)
add 0b7592c fix bug:support includeLocation for AsyncLogger (#352)
add bab0242 LOG4J2-2811 - Add missing includeLocation parameter when
creating AsyncLogger.
add 009107f LOG4J2-2790 Conditionally allocate PluginEntry during
PluginCache load (#344)
add d780a8d LOG4J2-2790 - Conditionally allocate PluginEntry during
PluginCache loading.
add b75aa08 Fix javadoc issues and fix dependency error
add c02e6ce Fix Javadoc issues
new 45306c2 Merge remote-tracking branch 'origin/master' into
mean-bean-machine
The 8 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:
.../main/java/org/apache/log4j/WriterAppender.java | 10 +-
.../apache/log4j/bridge/RewritePolicyAdapter.java | 1 +
.../java/org/apache/log4j/or/ObjectRenderer.java | 2 +
.../java/org/apache/log4j/spi/Configurator.java | 4 +-
.../java/org/apache/log4j/spi/LocationInfo.java | 20 +--
.../org/apache/log4j/xml/XmlConfiguration.java | 8 ++
.../apache/logging/log4j/util/StackLocator.java | 3 +-
.../logging/log4j/util/StackLocatorTest.java | 9 +-
.../builder/impl/DefaultConfigurationBuilder.java | 3 +-
.../logging/log4j/core/filter/TimeFilter.java | 138 ++++++++++++---------
.../logging/log4j/core/lookup/EventLookup.java | 72 +++++++++++
.../apache/logging/log4j/core/util/FileUtils.java | 47 +++----
.../logging/log4j/core/GcFreeLoggingTestUtil.java | 6 +-
.../logging/log4j/core/filter/TimeFilterTest.java | 132 +++++++++++++++++++-
...{MarkerLookupTest.java => EventLookupTest.java} | 79 +++++++-----
.../logging/log4j/core/util/FileUtilsTest.java | 48 ++++---
log4j-core/src/test/resources/gcFreeLogging.xml | 8 +-
.../test/resources/gcFreeMixedSyncAsyncLogging.xml | 8 +-
.../log4j/jackson/AbstractJacksonLayout.java | 6 +-
.../logging/log4j/plugins/api/DependentScoped.java | 3 +
.../logging/log4j/plugins/api/SingletonScoped.java | 3 +
.../log4j/plugins/defaults/bean/BeanInstance.java | 29 -----
.../plugins/defaults/bean/DefaultBeanManager.java | 13 +-
.../defaults/bean/DefaultInjectionTarget.java | 10 +-
.../log4j/plugins/defaults/bean/ProvidedBean.java | 13 +-
.../log4j/plugins/defaults/bean/ProviderBean.java | 13 +-
.../defaults/model/DefaultElementManager.java | 2 +-
.../plugins/defaults/model/DefaultQualifiers.java | 87 -------------
.../log4j/plugins/processor/PluginCache.java | 25 ++--
.../log4j/plugins/spi/bean/BeanManager.java | 8 +-
...tionTargetFactory.java => ProviderFactory.java} | 6 +-
.../log4j/plugins/spi/model/Qualifiers.java | 64 ++++++++--
.../log4j/plugins/test/BeanJUnit4Runner.java | 9 +-
pom.xml | 2 +-
src/changes/changes.xml | 18 +++
src/site/asciidoc/manual/configuration.adoc | 1 +
src/site/asciidoc/manual/garbagefree.adoc | 2 +-
src/site/asciidoc/manual/lookups.adoc | 74 +++++++++++
src/site/site.xml | 3 +
39 files changed, 632 insertions(+), 357 deletions(-)
create mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/EventLookup.java
copy
log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/{MarkerLookupTest.java
=> EventLookupTest.java} (50%)
delete mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/bean/BeanInstance.java
delete mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/model/DefaultQualifiers.java
copy
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/bean/{InjectionTargetFactory.java
=> ProviderFactory.java} (84%)