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 c83c9a1 Move DI SPI to log4j-core
new cd461f1 Add more DI API docs with some renames
new 79561f8 Add more DI API docs
new f7ea16e Simplify reflection model and qualifiers matching
add 8765324 LOG4J2-3080 Use SimpleMessage in Log4j 1 Category whenever
possible. (#504)
add 8cb5bf3 Configure dependabot to track GitHub Action and Dockerfile
dependencies (#515)
add ba8e696 Bump actions/setup-java from 1 to 2.1.0 (#518)
add c89b4a0 NOJIRA Fix setup-java GitHub Action configuration.
add 0043e92 Use final modifier wherever possible. (#506)
add 0ff6a6e Rephrase comment in SystemClock. (#521)
new 9eb91f9 Merge branch 'master' into mean-bean-machine
The 4 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/dependabot.yml | 22 +-
.github/workflows/main.yml | 3 +-
.../src/main/java/org/apache/log4j/Category.java | 25 +-
.../test/java/org/apache/log4j/CategoryTest.java | 119 +-
.../java/org/apache/logging/log4j/core/Logger.java | 2 +-
.../apache/logging/log4j/core/LoggerContext.java | 28 +-
.../log4j/core/appender/AbstractFileAppender.java | 2 +-
.../appender/AbstractOutputStreamAppender.java | 4 +-
.../core/appender/AbstractWriterAppender.java | 2 +-
.../core/appender/AppenderLoggingException.java | 4 +-
.../appender/AsyncAppenderEventDispatcher.java | 2 +-
.../log4j/core/appender/ConsoleAppender.java | 6 +-
.../log4j/core/appender/FailoverAppender.java | 4 +-
.../logging/log4j/core/appender/FileAppender.java | 2 +-
.../logging/log4j/core/appender/FileManager.java | 6 +-
.../core/appender/HttpURLConnectionManager.java | 6 +-
.../core/appender/MemoryMappedFileAppender.java | 2 +-
.../core/appender/MemoryMappedFileManager.java | 2 +-
.../log4j/core/appender/OutputStreamAppender.java | 2 +-
.../log4j/core/appender/OutputStreamManager.java | 2 +-
.../core/appender/RandomAccessFileManager.java | 2 +-
.../log4j/core/appender/WriterAppender.java | 2 +-
.../core/appender/db/AbstractDatabaseAppender.java | 2 +-
.../appender/db/DbAppenderLoggingException.java | 4 +-
.../log4j/core/appender/nosql/NoSqlAppender.java | 8 +-
.../core/appender/rewrite/RewriteAppender.java | 2 +-
.../appender/rolling/AbstractRolloverStrategy.java | 4 +-
.../appender/rolling/DefaultRolloverStrategy.java | 6 +-
.../core/appender/rolling/PatternProcessor.java | 4 +-
.../core/appender/rolling/RollingFileManager.java | 30 +-
.../rolling/RollingRandomAccessFileManager.java | 6 +-
.../appender/rolling/action/DeletingVisitor.java | 2 +-
.../appender/rolling/action/FileRenameAction.java | 2 +-
.../appender/rolling/action/GzCompressAction.java | 2 +-
.../appender/rolling/action/SortingVisitor.java | 2 +-
.../core/appender/routing/IdlePurgePolicy.java | 2 +-
.../core/appender/routing/RoutingAppender.java | 12 +-
.../logging/log4j/core/async/AsyncLogger.java | 16 +-
.../log4j/core/async/AsyncLoggerConfig.java | 2 +-
.../core/async/AsyncQueueFullPolicyFactory.java | 6 +-
.../async/BasicAsyncLoggerContextSelector.java | 8 +-
.../core/async/DefaultAsyncQueueFullPolicy.java | 2 +-
.../logging/log4j/core/async/DisruptorUtil.java | 2 +-
.../log4j/core/async/RingBufferLogEvent.java | 2 +-
.../core/async/RingBufferLogEventHandler.java | 2 +-
.../core/async/ThreadNameCachingStrategy.java | 6 +-
.../log4j/core/config/AbstractConfiguration.java | 34 +-
.../log4j/core/config/ConfigurationFactory.java | 26 +-
.../core/config/ConfigurationFileWatcher.java | 8 +-
.../log4j/core/config/ConfigurationSource.java | 36 +-
.../logging/log4j/core/config/Configurator.java | 6 +-
.../logging/log4j/core/config/HttpWatcher.java | 26 +-
.../logging/log4j/core/config/LoggerConfig.java | 12 +-
.../log4j/core/config/ReliabilityStrategy.java | 4 +-
.../log4j/core/config/arbiters/ScriptArbiter.java | 4 +-
.../log4j/core/config/arbiters/SelectArbiter.java | 6 +-
.../config/arbiters/SystemPropertyArbiter.java | 2 +-
.../builder/impl/DefaultConfigurationBuilder.java | 16 +-
.../config/composite/CompositeConfiguration.java | 2 +-
.../core/config/di/AmbiguousBeanException.java | 2 -
.../log4j/core/config/di/{api/bean => }/Bean.java | 32 +-
.../logging/log4j/core/config/di/BeanManager.java | 237 ++++
.../di/{api/bean => }/InitializationContext.java | 2 +-
.../config/di/{api/model => }/InjectionPoint.java | 19 +-
.../log4j/core/config/di/InjectionTarget.java | 63 ++
.../di/{api/bean => }/InjectionTargetFactory.java | 2 +-
.../core/config/di/{api/bean => }/Injector.java | 20 +-
.../logging/log4j/core/config/di/Producer.java | 67 ++
.../config/di/{api/bean => }/ProducerFactory.java | 2 +-
.../config/di/{api/bean => }/ProviderFactory.java | 4 +-
.../config/di/{api/bean => }/ScopeContext.java | 4 +-
.../core/config/di/UnsatisfiedBeanException.java | 2 -
.../log4j/core/config/di/ValidationException.java | 17 +-
.../log4j/core/config/di/api/bean/BeanManager.java | 113 --
.../log4j/core/config/di/api/bean/Producer.java | 37 -
.../core/config/di/api/model/ElementManager.java | 152 ---
.../config/di/api/model/MetaAnnotationElement.java | 24 -
.../log4j/core/config/di/api/model/MetaClass.java | 42 -
.../core/config/di/api/model/MetaConstructor.java | 22 -
.../core/config/di/api/model/MetaElement.java | 56 -
.../core/config/di/api/model/MetaExecutable.java | 24 -
.../log4j/core/config/di/api/model/MetaField.java | 24 -
.../log4j/core/config/di/api/model/MetaMember.java | 24 -
.../log4j/core/config/di/api/model/MetaMethod.java | 22 -
.../core/config/di/api/model/MetaParameter.java | 21 -
.../log4j/core/config/di/api/model/Qualifiers.java | 87 --
.../config/di/impl/{bean => }/AbstractBean.java | 36 +-
.../di/impl/{bean => }/AbstractProducer.java | 23 +-
.../impl/{bean => }/AbstractProducerFactory.java | 23 +-
.../di/impl/{bean => }/DefaultBeanManager.java | 267 +++--
.../{bean => }/DefaultInitializationContext.java | 6 +-
.../core/config/di/impl/DefaultInjectionPoint.java | 121 ++
.../di/impl/{bean => }/DefaultInjectionTarget.java | 78 +-
.../di/impl/DefaultInjectionTargetFactory.java | 125 +++
.../log4j/core/config/di/impl/DefaultInjector.java | 118 ++
.../di/impl/{bean => }/DefaultScopeContext.java | 8 +-
.../di/impl/{bean => }/DependentScopeContext.java | 10 +-
.../config/di/impl/{bean => }/FieldProducer.java | 34 +-
.../di/impl/{bean => }/FieldProducerFactory.java | 23 +-
.../di/impl/{bean => }/InjectionTargetBean.java | 22 +-
.../config/di/impl/{bean => }/MethodProducer.java | 25 +-
.../di/impl/{bean => }/MethodProducerFactory.java | 22 +-
.../config/di/impl/{bean => }/OptionalBean.java | 30 +-
.../config/di/impl/{bean => }/ProducerBean.java | 22 +-
.../{bean/SystemBean.java => ProvidedBean.java} | 56 +-
.../log4j/core/config/di/impl/ProviderBean.java | 76 ++
.../impl/bean/DefaultInjectionTargetFactory.java | 111 --
.../core/config/di/impl/bean/DefaultInjector.java | 84 --
.../core/config/di/impl/bean/ProvidedBean.java | 36 -
.../core/config/di/impl/bean/ProviderBean.java | 37 -
.../di/impl/model/AbstractMetaExecutable.java | 44 -
.../config/di/impl/model/AbstractMetaMember.java | 74 --
.../di/impl/model/DefaultElementManager.java | 197 ----
.../di/impl/model/DefaultInjectionPoint.java | 98 --
.../di/impl/model/DefaultMetaAnnotation.java | 112 --
.../impl/model/DefaultMetaAnnotationElement.java | 76 --
.../config/di/impl/model/DefaultMetaClass.java | 143 ---
.../di/impl/model/DefaultMetaConstructor.java | 50 -
.../config/di/impl/model/DefaultMetaField.java | 57 -
.../config/di/impl/model/DefaultMetaMethod.java | 51 -
.../config/di/impl/model/DefaultMetaParameter.java | 64 --
.../core/config/di/impl/model/DefaultVariable.java | 79 --
.../log4j/core/config/json/JsonConfiguration.java | 4 +-
.../log4j/core/config/plugins/PluginAliases.java | 10 +-
.../log4j/core/config/plugins/PluginAttribute.java | 3 +
.../config/plugins/PluginBuilderAttribute.java | 3 +
.../log4j/core/config/plugins/PluginElement.java | 3 +
.../log4j/core/config/plugins/PluginValue.java | 3 +
.../config/plugins/util/PluginAliasesProvider.java | 21 +-
.../util/PluginAttributeNameProvider.java} | 19 +-
.../core/config/plugins/util/PluginBuilder.java | 6 +-
.../util/PluginBuilderAttributeNameProvider.java | 9 +-
.../plugins/util/PluginElementNameProvider.java | 9 +-
.../plugins/util/PluginValueNameProvider.java | 9 +-
.../plugins/visitors/PluginElementVisitor.java | 2 +-
.../properties/PropertiesConfigurationBuilder.java | 2 +-
.../log4j/core/config/xml/XmlConfiguration.java | 4 +-
.../log4j/core/filter/AbstractFilterable.java | 2 +-
.../logging/log4j/core/filter/NeutralFilter.java | 42 +-
.../logging/log4j/core/filter/TimeFilter.java | 10 +-
.../log4j/core/impl/ContextDataFactory.java | 2 +-
.../log4j/core/impl/ExtendedStackTraceElement.java | 4 +-
.../log4j/core/impl/Log4jContextFactory.java | 6 +-
.../logging/log4j/core/impl/Log4jLogEvent.java | 2 +-
.../logging/log4j/core/impl/LogEventFactory.java | 4 +-
.../logging/log4j/core/impl/MementoMessage.java | 4 +-
.../logging/log4j/core/impl/MutableLogEvent.java | 4 +-
.../log4j/core/impl/ReusableLogEventFactory.java | 4 +-
.../log4j/core/impl/ThreadContextDataInjector.java | 8 +-
.../logging/log4j/core/impl/ThrowableProxy.java | 2 +-
.../log4j/core/impl/ThrowableProxyHelper.java | 4 +-
.../log4j/core/impl/ThrowableProxyRenderer.java | 16 +-
.../logging/log4j/core/layout/GelfLayout.java | 20 +-
.../logging/log4j/core/layout/HtmlLayout.java | 2 +-
.../log4j/core/layout/LevelPatternSelector.java | 2 +-
.../log4j/core/layout/MarkerPatternSelector.java | 2 +-
.../logging/log4j/core/layout/PatternLayout.java | 10 +-
.../logging/log4j/core/layout/Rfc5424Layout.java | 4 +-
.../log4j/core/layout/ScriptPatternSelector.java | 2 +-
.../logging/log4j/core/lookup/Base64StrLookup.java | 2 +-
.../logging/log4j/core/lookup/StrSubstitutor.java | 6 +-
.../log4j/core/net/DatagramSocketManager.java | 2 +-
.../log4j/core/net/MulticastDnsAdvertiser.java | 2 +-
.../logging/log4j/core/net/SslSocketManager.java | 12 +-
.../logging/log4j/core/net/TcpSocketManager.java | 40 +-
.../log4j/core/net/UrlConnectionFactory.java | 18 +-
.../net/ssl/AbstractKeyStoreConfiguration.java | 2 +-
.../core/net/ssl/EnvironmentPasswordProvider.java | 2 +-
.../log4j/core/net/ssl/FilePasswordProvider.java | 8 +-
.../log4j/core/net/ssl/KeyStoreConfiguration.java | 6 +-
.../log4j/core/net/ssl/SslConfiguration.java | 2 +-
.../core/net/ssl/SslConfigurationFactory.java | 12 +-
.../core/net/ssl/StoreConfigurationException.java | 2 +-
.../core/net/ssl/TrustStoreConfiguration.java | 4 +-
.../log4j/core/osgi/BundleContextSelector.java | 2 +-
.../log4j/core/pattern/DatePatternConverter.java | 4 +-
.../log4j/core/pattern/HighlightConverter.java | 4 +-
.../log4j/core/pattern/JAnsiTextRenderer.java | 2 +-
.../log4j/core/pattern/MapPatternConverter.java | 4 +-
.../core/pattern/MessagePatternConverter.java | 2 +-
.../log4j/core/pattern/NameAbbreviator.java | 2 +-
.../logging/log4j/core/pattern/PatternParser.java | 12 +-
.../core/pattern/ProcessIdPatternConverter.java | 2 +-
.../log4j/core/pattern/RepeatPatternConverter.java | 2 +-
.../core/pattern/ThrowablePatternConverter.java | 4 +-
.../logging/log4j/core/script/ScriptFile.java | 2 +-
.../log4j/core/selector/BasicContextSelector.java | 8 +-
.../core/selector/ClassLoaderContextSelector.java | 12 +-
.../log4j/core/selector/ContextSelector.java | 12 +-
.../log4j/core/selector/JndiContextSelector.java | 10 +-
.../logging/log4j/core/time/ClockFactory.java | 8 +-
.../logging/log4j/core/time/MutableInstant.java | 4 +-
.../log4j/core/time/internal/SystemClock.java | 8 +-
.../core/time/internal/format/FastDateParser.java | 2 +-
.../core/time/internal/format/FormatCache.java | 2 +-
.../log4j/core/tools/picocli/CommandLine.java | 1166 ++++++++++----------
.../logging/log4j/core/util/AbstractWatcher.java | 2 +-
.../core/util/BasicAuthorizationProvider.java | 12 +-
.../core/util/DefaultShutdownCallbackRegistry.java | 6 +-
.../apache/logging/log4j/core/util/FileUtils.java | 4 +-
.../org/apache/logging/log4j/core/util/Loader.java | 4 +-
.../apache/logging/log4j/core/util/NetUtils.java | 4 +-
.../logging/log4j/core/util/OptionConverter.java | 30 +-
.../logging/log4j/core/util/ProcessIdUtil.java | 12 +-
.../org/apache/logging/log4j/core/util/Source.java | 6 +-
.../apache/logging/log4j/core/util/UuidUtil.java | 2 +-
.../logging/log4j/core/util/WatchManager.java | 18 +-
.../logging/log4j/core/util/WatcherFactory.java | 22 +-
.../log4j/core/util/WrappedFileWatcher.java | 18 +-
.../log4j/core/util/datetime/FastDateFormat.java | 2 +-
log4j-core/src/main/java9/module-info.java | 5 +-
.../log4j/core/test/junit/BeanJUnit4Runner.java | 133 ---
.../logging/log4j/core/test/junit/WithBeans.java | 36 -
.../log4j/core/config/di/BeanManagerTest.java | 479 ++++++++
.../log4j/core/config/di/InjectionPointTest.java | 136 +++
.../log4j/core/config/di/InjectionTargetTest.java | 109 ++
.../di/impl/bean/DefaultBeanManagerTest.java | 352 ------
log4j-core/src/test/java9/module-info.java | 3 +-
log4j-layout-template-json/pom.xml | 11 +-
.../json/resolver/MessageResolverTest.java | 77 ++
.../messageFallbackKeyUsingJsonTemplateLayout.xml | 36 +
.../logging/log4j/plugins/PluginAliases.java | 4 +
.../apache/logging/log4j/plugins/api/Default.java | 31 -
.../apache/logging/log4j/plugins/api/Produces.java | 32 -
.../log4j/plugins/{api => di}/AnnotationAlias.java | 8 +-
.../log4j/plugins/{api => di}/DependentScoped.java | 2 +-
.../log4j/plugins/{api => di}/Disposes.java | 10 +-
.../logging/log4j/plugins/{api => di}/Inject.java | 23 +-
.../logging/log4j/plugins/{api => di}/Named.java | 6 +-
.../{api/Ignore.java => di/NamedAliases.java} | 16 +-
.../log4j/plugins/{api => di}/PostConstruct.java | 8 +-
.../log4j/plugins/{api => di}/PreDestroy.java | 6 +-
.../apache/logging/log4j/plugins/di/Produces.java | 52 +
.../log4j/plugins/{api => di}/Provider.java | 2 +-
.../log4j/plugins/{api => di}/ScopeType.java | 12 +-
.../log4j/plugins/{api => di}/SingletonScoped.java | 2 +-
.../log4j/plugins/{api => di}/package-info.java | 2 +-
.../inject/AbstractConfigurationInjector.java | 8 +-
.../AliasesProvider.java} | 11 +-
.../name/AnnotatedElementAliasesProvider.java | 46 +
.../plugins/name/AnnotatedElementNameProvider.java | 56 +-
.../log4j/plugins/name/NamedAliasesProvider.java | 54 +
.../plugins/name/NamedQualifierNameProvider.java | 2 +-
.../log4j/plugins/name/PluginAliasesProvider.java | 15 +-
.../logging/log4j/plugins/util/AnnotationUtil.java | 28 +-
.../log4j/plugins/util/ParameterizedTypeImpl.java | 2 +-
.../logging/log4j/plugins/util/TypeUtil.java | 24 +-
log4j-plugins/src/main/java9/module-info.java | 1 +
src/changes/changes.xml | 3 +
249 files changed, 3665 insertions(+), 4101 deletions(-)
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/{api/bean =>
}/Bean.java (69%)
create mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/BeanManager.java
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/{api/bean =>
}/InitializationContext.java (97%)
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/{api/model =>
}/InjectionPoint.java (75%)
create mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/InjectionTarget.java
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/{api/bean =>
}/InjectionTargetFactory.java (94%)
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/{api/bean =>
}/Injector.java (61%)
create mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/Producer.java
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/{api/bean =>
}/ProducerFactory.java (94%)
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/{api/bean =>
}/ProviderFactory.java (89%)
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/{api/bean =>
}/ScopeContext.java (94%)
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/api/bean/BeanManager.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/api/bean/Producer.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/api/model/ElementManager.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/api/model/MetaAnnotationElement.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/api/model/MetaClass.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/api/model/MetaConstructor.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/api/model/MetaElement.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/api/model/MetaExecutable.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/api/model/MetaField.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/api/model/MetaMember.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/api/model/MetaMethod.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/api/model/MetaParameter.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/api/model/Qualifiers.java
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/{bean =>
}/AbstractBean.java (63%)
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/{bean =>
}/AbstractProducer.java (77%)
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/{bean =>
}/AbstractProducerFactory.java (62%)
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/{bean =>
}/DefaultBeanManager.java (57%)
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/{bean =>
}/DefaultInitializationContext.java (96%)
create mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/DefaultInjectionPoint.java
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/{bean =>
}/DefaultInjectionTarget.java (58%)
create mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/DefaultInjectionTargetFactory.java
create mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/DefaultInjector.java
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/{bean =>
}/DefaultScopeContext.java (90%)
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/{bean =>
}/DependentScopeContext.java (83%)
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/{bean =>
}/FieldProducer.java (59%)
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/{bean =>
}/FieldProducerFactory.java (63%)
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/{bean =>
}/InjectionTargetBean.java (77%)
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/{bean =>
}/MethodProducer.java (67%)
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/{bean =>
}/MethodProducerFactory.java (65%)
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/{bean =>
}/OptionalBean.java (73%)
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/{bean =>
}/ProducerBean.java (78%)
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/{bean/SystemBean.java
=> ProvidedBean.java} (50%)
create mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/ProviderBean.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/bean/DefaultInjectionTargetFactory.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/bean/DefaultInjector.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/bean/ProvidedBean.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/bean/ProviderBean.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/model/AbstractMetaExecutable.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/model/AbstractMetaMember.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/model/DefaultElementManager.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/model/DefaultInjectionPoint.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/model/DefaultMetaAnnotation.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/model/DefaultMetaAnnotationElement.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/model/DefaultMetaClass.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/model/DefaultMetaConstructor.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/model/DefaultMetaField.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/model/DefaultMetaMethod.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/model/DefaultMetaParameter.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/impl/model/DefaultVariable.java
copy
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/api/Inject.java =>
log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginAliasesProvider.java
(64%)
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/config/{di/api/bean/InjectionTarget.java
=> plugins/util/PluginAttributeNameProvider.java} (60%)
copy
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/NamedQualifierNameProvider.java
=>
log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilderAttributeNameProvider.java
(69%)
copy
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/NamedQualifierNameProvider.java
=>
log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginElementNameProvider.java
(71%)
copy
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/NamedQualifierNameProvider.java
=>
log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginValueNameProvider.java
(72%)
delete mode 100644
log4j-core/src/test/java-test/org/apache/logging/log4j/core/test/junit/BeanJUnit4Runner.java
delete mode 100644
log4j-core/src/test/java-test/org/apache/logging/log4j/core/test/junit/WithBeans.java
create mode 100644
log4j-core/src/test/java/org/apache/logging/log4j/core/config/di/BeanManagerTest.java
create mode 100644
log4j-core/src/test/java/org/apache/logging/log4j/core/config/di/InjectionPointTest.java
create mode 100644
log4j-core/src/test/java/org/apache/logging/log4j/core/config/di/InjectionTargetTest.java
delete mode 100644
log4j-core/src/test/java/org/apache/logging/log4j/core/config/di/impl/bean/DefaultBeanManagerTest.java
create mode 100644
log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json/resolver/MessageResolverTest.java
create mode 100644
log4j-layout-template-json/src/test/resources/messageFallbackKeyUsingJsonTemplateLayout.xml
delete mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/api/Default.java
delete mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/api/Produces.java
rename log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/{api =>
di}/AnnotationAlias.java (76%)
rename log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/{api =>
di}/DependentScoped.java (97%)
rename log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/{api =>
di}/Disposes.java (63%)
rename log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/{api =>
di}/Inject.java (50%)
rename log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/{api =>
di}/Named.java (89%)
rename
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/{api/Ignore.java
=> di/NamedAliases.java} (69%)
rename log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/{api =>
di}/PostConstruct.java (78%)
rename log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/{api =>
di}/PreDestroy.java (85%)
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/Produces.java
rename log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/{api =>
di}/Provider.java (94%)
rename log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/{api =>
di}/ScopeType.java (73%)
rename log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/{api =>
di}/SingletonScoped.java (96%)
rename log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/{api =>
di}/package-info.java (95%)
rename
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/{api/QualifierType.java
=> name/AliasesProvider.java} (84%)
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/AnnotatedElementAliasesProvider.java
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/NamedAliasesProvider.java
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/api/model/MetaAnnotation.java
=>
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/name/PluginAliasesProvider.java
(69%)
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/config/di/api/model/Variable.java
=>
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/util/AnnotationUtil.java
(57%)
