diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 79a40d16..b2b7d392 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -47,10 +47,6 @@ - - - - diff --git a/src/Spring/Spring.Aop/Aop/Framework/Adapter/ThrowsAdviceInterceptor.cs b/src/Spring/Spring.Aop/Aop/Framework/Adapter/ThrowsAdviceInterceptor.cs index c01a3168..787d5df8 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/Adapter/ThrowsAdviceInterceptor.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/Adapter/ThrowsAdviceInterceptor.cs @@ -106,7 +106,7 @@ namespace Spring.Aop.Framework.Adapter [Serializable] public sealed class ThrowsAdviceInterceptor : IMethodInterceptor { - private static readonly ILog log = LogManager.GetLogger(typeof(ThrowsAdviceInterceptor)); + private static readonly ILogger log = LogManager.GetLogger(); private const string SpecialThrowingMethodName = "AfterThrowing"; diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAdvisorAutoProxyCreator.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAdvisorAutoProxyCreator.cs index 42be5e46..48a2b639 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAdvisorAutoProxyCreator.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAdvisorAutoProxyCreator.cs @@ -48,17 +48,8 @@ namespace Spring.Aop.Framework.AutoProxy /// Erich Eichinger public abstract class AbstractAdvisorAutoProxyCreator : AbstractAutoProxyCreator { - private readonly ILog Log; private IAdvisorRetrievalHelper _advisorRetrievalHelper; - /// - /// Initialize - /// - protected AbstractAdvisorAutoProxyCreator() - { - Log = LogManager.GetLogger(this.GetType()); - } - /// /// We override this method to ensure that all candidate advisors are materialized /// under a stack trace including this object. Otherwise, the dependencies won't diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAutoProxyCreator.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAutoProxyCreator.cs index 0b2e2635..59292dbc 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAutoProxyCreator.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAutoProxyCreator.cs @@ -66,7 +66,7 @@ namespace Spring.Aop.Framework.AutoProxy /// /// The logger for this class hierarchy. /// - protected readonly ILog logger; + protected readonly ILogger logger; /// /// Convenience constant for subclasses: Return value for "do not proxy". diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ObjectFactoryAdvisorRetrievalHelper.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ObjectFactoryAdvisorRetrievalHelper.cs index 0ff70ec9..516e2a58 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ObjectFactoryAdvisorRetrievalHelper.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ObjectFactoryAdvisorRetrievalHelper.cs @@ -32,7 +32,7 @@ namespace Spring.Aop.Framework.AutoProxy /// Erich Eichinger public class ObjectFactoryAdvisorRetrievalHelper : IAdvisorRetrievalHelper { - private readonly ILog _log; + private readonly ILogger _log; private readonly IConfigurableListableObjectFactory _objectFactory; private List _cachedObjectNames; diff --git a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/Target/AbstractPrototypeTargetSourceCreator.cs b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/Target/AbstractPrototypeTargetSourceCreator.cs index 7ba6b00c..7ac1fe80 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/Target/AbstractPrototypeTargetSourceCreator.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/AutoProxy/Target/AbstractPrototypeTargetSourceCreator.cs @@ -37,7 +37,7 @@ namespace Spring.Aop.Framework.AutoProxy.Target /// /// The logger /// - protected readonly ILog logger = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); + protected readonly ILogger logger = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); #region ITargetSourceCreator Members diff --git a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/CachedAopProxyFactory.cs b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/CachedAopProxyFactory.cs index 8793a93d..14a0fbee 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/CachedAopProxyFactory.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/CachedAopProxyFactory.cs @@ -49,9 +49,9 @@ namespace Spring.Aop.Framework.DynamicProxy public class CachedAopProxyFactory : DefaultAopProxyFactory { /// - /// The shared instance for this class. + /// The shared instance for this class. /// - private static readonly ILog logger = LogManager.GetLogger(typeof(CachedAopProxyFactory)); + private static readonly ILogger logger = LogManager.GetLogger(); private static readonly Hashtable typeCache = new Hashtable(); diff --git a/src/Spring/Spring.Aop/Aop/Framework/ProxyFactoryObject.cs b/src/Spring/Spring.Aop/Aop/Framework/ProxyFactoryObject.cs index 0df87344..e2c8bc46 100644 --- a/src/Spring/Spring.Aop/Aop/Framework/ProxyFactoryObject.cs +++ b/src/Spring/Spring.Aop/Aop/Framework/ProxyFactoryObject.cs @@ -87,9 +87,9 @@ namespace Spring.Aop.Framework : AdvisedSupport, IFactoryObject, IObjectFactoryAware { /// - /// The instance for this class. + /// The instance for this class. /// - private static readonly ILog logger = LogManager.GetLogger(); + private static readonly ILogger logger = LogManager.GetLogger(); /// /// Is the object managed by this factory a singleton or a prototype? diff --git a/src/Spring/Spring.Aop/Aop/Support/SdkRegularExpressionMethodPointcut.cs b/src/Spring/Spring.Aop/Aop/Support/SdkRegularExpressionMethodPointcut.cs index ad83c7ff..5eca1850 100644 --- a/src/Spring/Spring.Aop/Aop/Support/SdkRegularExpressionMethodPointcut.cs +++ b/src/Spring/Spring.Aop/Aop/Support/SdkRegularExpressionMethodPointcut.cs @@ -40,7 +40,7 @@ namespace Spring.Aop.Support public class SdkRegularExpressionMethodPointcut : AbstractRegularExpressionMethodPointcut { [NonSerialized] - private static readonly ILog _logger = LogManager.GetLogger(typeof(SdkRegularExpressionMethodPointcut)); + private static readonly ILogger _logger = LogManager.GetLogger(); private Regex[] _compiledPatterns = new Regex[0]; private RegexOptions _defaultOptions = RegexOptions.None; diff --git a/src/Spring/Spring.Aop/Aop/Target/AbstractPrototypeTargetSource.cs b/src/Spring/Spring.Aop/Aop/Target/AbstractPrototypeTargetSource.cs index 6b2c1474..6f9e4a33 100644 --- a/src/Spring/Spring.Aop/Aop/Target/AbstractPrototypeTargetSource.cs +++ b/src/Spring/Spring.Aop/Aop/Target/AbstractPrototypeTargetSource.cs @@ -238,9 +238,9 @@ namespace Spring.Aop.Target } /// - /// The shared instance for this class (and derived classes). + /// The shared instance for this class (and derived classes). /// - protected readonly ILog logger = LogManager.GetLogger(typeof (AbstractPrototypeTargetSource)); + protected readonly ILogger logger = LogManager.GetLogger(); private String _targetObjectName; private IObjectFactory _owningObjectFactory; diff --git a/src/Spring/Spring.Aop/Aspects/AbstractExceptionHandler.cs b/src/Spring/Spring.Aop/Aspects/AbstractExceptionHandler.cs index 007ad5ec..24dc090a 100644 --- a/src/Spring/Spring.Aop/Aspects/AbstractExceptionHandler.cs +++ b/src/Spring/Spring.Aop/Aspects/AbstractExceptionHandler.cs @@ -35,7 +35,7 @@ namespace Spring.Aspects /// /// The logging instance /// - protected readonly ILog log; + protected readonly ILogger log; private IList sourceExceptionNames = new ArrayList(); private IList sourceExceptionTypes = new ArrayList(); diff --git a/src/Spring/Spring.Aop/Aspects/Cache/BaseCacheAdvice.cs b/src/Spring/Spring.Aop/Aspects/Cache/BaseCacheAdvice.cs index fc621e6e..a5da7f6e 100644 --- a/src/Spring/Spring.Aop/Aspects/Cache/BaseCacheAdvice.cs +++ b/src/Spring/Spring.Aop/Aspects/Cache/BaseCacheAdvice.cs @@ -21,8 +21,7 @@ #region Imports using System.Reflection; - - +using Microsoft.Extensions.Logging; using Spring.Caching; using Spring.Context; using Spring.Expressions; @@ -41,7 +40,7 @@ namespace Spring.Aspects.Cache /// /// Shared logger instance /// - protected readonly ILog logger; + protected readonly ILogger logger; private IApplicationContext applicationContext; diff --git a/src/Spring/Spring.Aop/Aspects/Exceptions/ExceptionHandlerAdvice.cs b/src/Spring/Spring.Aop/Aspects/Exceptions/ExceptionHandlerAdvice.cs index 499340f6..33b0e7a6 100644 --- a/src/Spring/Spring.Aop/Aspects/Exceptions/ExceptionHandlerAdvice.cs +++ b/src/Spring/Spring.Aop/Aspects/Exceptions/ExceptionHandlerAdvice.cs @@ -74,7 +74,7 @@ namespace Spring.Aspects.Exceptions /// /// Log instance available to subclasses /// - protected static ILog log = LogManager.GetLogger(typeof(ExceptionHandlerAdvice)); + protected static ILogger log = LogManager.GetLogger(); private IList exceptionHandlers = new ArrayList(); diff --git a/src/Spring/Spring.Aop/Aspects/Exceptions/LogExceptionHandler.cs b/src/Spring/Spring.Aop/Aspects/Exceptions/LogExceptionHandler.cs index 0921c32a..eb04fe34 100644 --- a/src/Spring/Spring.Aop/Aspects/Exceptions/LogExceptionHandler.cs +++ b/src/Spring/Spring.Aop/Aspects/Exceptions/LogExceptionHandler.cs @@ -133,7 +133,7 @@ namespace Spring.Aspects.Exceptions public override object HandleException(IDictionary callContextDictionary) { //TODO log name is targettype. - ILog adviceLogger = LogManager.GetLogger(logName); + ILogger adviceLogger = LogManager.GetLogger(logName); callContextDictionary.Add("log", adviceLogger); try { diff --git a/src/Spring/Spring.Aop/Aspects/Logging/AbstractLoggingAdvice.cs b/src/Spring/Spring.Aop/Aspects/Logging/AbstractLoggingAdvice.cs index f6706dba..0794b305 100644 --- a/src/Spring/Spring.Aop/Aspects/Logging/AbstractLoggingAdvice.cs +++ b/src/Spring/Spring.Aop/Aspects/Logging/AbstractLoggingAdvice.cs @@ -42,7 +42,7 @@ namespace Spring.Aspects.Logging /// The default ILog instance used to write logging messages. /// [NonSerialized] - protected ILog defaultLogger; + protected ILogger defaultLogger; /// /// The name of the logger instance to use for obtaining from . @@ -69,7 +69,7 @@ namespace Spring.Aspects.Logging /// /// Creates a new advice instance using the given logger by default. /// - protected AbstractLoggingAdvice(ILog defaultLogger) + protected AbstractLoggingAdvice(ILogger defaultLogger) { this.defaultLogger = defaultLogger; } @@ -163,7 +163,7 @@ namespace Spring.Aspects.Logging public object Invoke(IMethodInvocation invocation) { object o = invocation.This; - ILog log = GetLoggerForInvocation(invocation); + ILogger log = GetLoggerForInvocation(invocation); if (IsInterceptorEnabled(invocation, log)) { return InvokeUnderLog(invocation, log); @@ -187,7 +187,7 @@ namespace Spring.Aspects.Logging /// /// true if [is interceptor enabled] [the specified invocation]; otherwise, false. /// - protected virtual bool IsInterceptorEnabled(IMethodInvocation invocation, ILog log) + protected virtual bool IsInterceptorEnabled(IMethodInvocation invocation, ILogger log) { return IsLogEnabled(log); } @@ -203,7 +203,7 @@ namespace Spring.Aspects.Logging /// /// true if log is for a given log level; otherwise, false. /// - protected virtual bool IsLogEnabled(ILog log) + protected virtual bool IsLogEnabled(ILogger log) { return log.IsEnabled(LogLevel.Trace); } @@ -230,7 +230,7 @@ namespace Spring.Aspects.Logging /// If any of the interceptors in the chain or the target object itself /// throws an exception. /// - protected abstract object InvokeUnderLog(IMethodInvocation invocation, ILog log); + protected abstract object InvokeUnderLog(IMethodInvocation invocation, ILogger log); /// @@ -243,7 +243,7 @@ namespace Spring.Aspects.Logging /// /// The method invocation being logged. /// The ILog instance to use. - protected virtual ILog GetLoggerForInvocation(IMethodInvocation invocation) + protected virtual ILogger GetLoggerForInvocation(IMethodInvocation invocation) { if (defaultLogger != null) { diff --git a/src/Spring/Spring.Aop/Aspects/Logging/SimpleLoggingAdvice.cs b/src/Spring/Spring.Aop/Aspects/Logging/SimpleLoggingAdvice.cs index 775ace36..0f766a85 100644 --- a/src/Spring/Spring.Aop/Aspects/Logging/SimpleLoggingAdvice.cs +++ b/src/Spring/Spring.Aop/Aspects/Logging/SimpleLoggingAdvice.cs @@ -94,7 +94,7 @@ namespace Spring.Aspects.Logging /// Initializes a new instance of the class. /// /// the default logger to use - public SimpleLoggingAdvice(ILog defaultLogger) + public SimpleLoggingAdvice(ILogger defaultLogger) : base(defaultLogger) {} @@ -189,7 +189,7 @@ namespace Spring.Aspects.Logging /// If any of the interceptors in the chain or the target object itself /// throws an exception. /// - protected override object InvokeUnderLog(IMethodInvocation invocation, ILog log) + protected override object InvokeUnderLog(IMethodInvocation invocation, ILogger log) { object returnValue = null; bool exitThroughException = false; @@ -234,7 +234,7 @@ namespace Spring.Aspects.Logging /// Default is true when the trace level is enabled. Subclasses may override this /// to change the level at which logging occurs, or return true to ignore level /// checks. - protected override bool IsLogEnabled(ILog log) + protected override bool IsLogEnabled(ILogger log) { switch (LogLevel) { @@ -413,7 +413,7 @@ namespace Spring.Aspects.Logging } } - private void WriteToLog(LogLevel logLevel, ILog log, string text, Exception e) + private void WriteToLog(LogLevel logLevel, ILogger log, string text, Exception e) { switch (logLevel) { diff --git a/src/Spring/Spring.Aop/Aspects/RetryAdvice.cs b/src/Spring/Spring.Aop/Aspects/RetryAdvice.cs index 51f7c467..1ef2aa93 100644 --- a/src/Spring/Spring.Aop/Aspects/RetryAdvice.cs +++ b/src/Spring/Spring.Aop/Aspects/RetryAdvice.cs @@ -43,7 +43,7 @@ namespace Spring.Aspects /// public delegate void SleepHandler(TimeSpan duration); - private static readonly ILog log; + private static readonly ILogger log; private static readonly TimeSpanConverter timeSpanConverter; static RetryAdvice() diff --git a/src/Spring/Spring.Core/Context/Attributes/AssemblyTypeScanner.cs b/src/Spring/Spring.Core/Context/Attributes/AssemblyTypeScanner.cs index 7b3aa17d..5030de35 100644 --- a/src/Spring/Spring.Core/Context/Attributes/AssemblyTypeScanner.cs +++ b/src/Spring/Spring.Core/Context/Attributes/AssemblyTypeScanner.cs @@ -35,7 +35,7 @@ namespace Spring.Context.Attributes /// /// Logger Instance. /// - protected static readonly ILog Logger = LogManager.GetLogger(); + protected static readonly ILogger Logger = LogManager.GetLogger(); /// /// Names of Assemblies to exclude from being loaded for scanning. diff --git a/src/Spring/Spring.Core/Context/Attributes/AssemblyTypeSource.cs b/src/Spring/Spring.Core/Context/Attributes/AssemblyTypeSource.cs index d538005d..ac6ee235 100644 --- a/src/Spring/Spring.Core/Context/Attributes/AssemblyTypeSource.cs +++ b/src/Spring/Spring.Core/Context/Attributes/AssemblyTypeSource.cs @@ -34,7 +34,7 @@ namespace Spring.Context.Attributes /// /// Logger Instance. /// - protected static readonly ILog Logger = LogManager.GetLogger(); + protected static readonly ILogger Logger = LogManager.GetLogger(); private readonly Assembly _assembly; diff --git a/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassEnhancer.cs b/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassEnhancer.cs index e8933c47..7a4b2348 100644 --- a/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassEnhancer.cs +++ b/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassEnhancer.cs @@ -85,7 +85,7 @@ namespace Spring.Context.Attributes { #region Logging - private static readonly ILog Logger = LogManager.GetLogger(); + private static readonly ILogger Logger = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassObjectDefinitionReader.cs b/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassObjectDefinitionReader.cs index 2be394fc..bdc33cd9 100644 --- a/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassObjectDefinitionReader.cs +++ b/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassObjectDefinitionReader.cs @@ -37,7 +37,7 @@ namespace Spring.Context.Attributes /// public class ConfigurationClassObjectDefinitionReader { - private static readonly ILog Logger = LogManager.GetLogger(); + private static readonly ILogger Logger = LogManager.GetLogger(); private IProblemReporter _problemReporter; diff --git a/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassPostProcessor.cs b/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassPostProcessor.cs index ebd55311..166f8fcc 100644 --- a/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassPostProcessor.cs +++ b/src/Spring/Spring.Core/Context/Attributes/ConfigurationClassPostProcessor.cs @@ -33,7 +33,7 @@ namespace Spring.Context.Attributes /// public class ConfigurationClassPostProcessor : IObjectDefinitionRegistryPostProcessor, IOrdered { - private static readonly ILog Logger = LogManager.GetLogger(); + private static readonly ILogger Logger = LogManager.GetLogger(); private bool _postProcessObjectDefinitionRegistryCalled; diff --git a/src/Spring/Spring.Core/Context/Attributes/ScannedGenericObjectDefinition.cs b/src/Spring/Spring.Core/Context/Attributes/ScannedGenericObjectDefinition.cs index a1c20500..cdfe2fa0 100644 --- a/src/Spring/Spring.Core/Context/Attributes/ScannedGenericObjectDefinition.cs +++ b/src/Spring/Spring.Core/Context/Attributes/ScannedGenericObjectDefinition.cs @@ -34,7 +34,7 @@ namespace Spring.Context.Attributes /// public class ScannedGenericObjectDefinition : GenericObjectDefinition { - private static readonly ILog Log = LogManager.GetLogger(); + private static readonly ILogger Log = LogManager.GetLogger(); /// /// Name provided by the Component Attribute diff --git a/src/Spring/Spring.Core/Context/Attributes/TypeFilters/AbstractLoadTypeFilter.cs b/src/Spring/Spring.Core/Context/Attributes/TypeFilters/AbstractLoadTypeFilter.cs index 14d535f2..b5088774 100644 --- a/src/Spring/Spring.Core/Context/Attributes/TypeFilters/AbstractLoadTypeFilter.cs +++ b/src/Spring/Spring.Core/Context/Attributes/TypeFilters/AbstractLoadTypeFilter.cs @@ -28,7 +28,7 @@ namespace Spring.Context.Attributes.TypeFilters /// public abstract class AbstractLoadTypeFilter : ITypeFilter { - private static readonly ILog Logger = LogManager.GetLogger(); + private static readonly ILogger Logger = LogManager.GetLogger(); /// diff --git a/src/Spring/Spring.Core/Context/Attributes/TypeFilters/CustomTypeFactory.cs b/src/Spring/Spring.Core/Context/Attributes/TypeFilters/CustomTypeFactory.cs index c80b5f0f..5d2ccf2f 100644 --- a/src/Spring/Spring.Core/Context/Attributes/TypeFilters/CustomTypeFactory.cs +++ b/src/Spring/Spring.Core/Context/Attributes/TypeFilters/CustomTypeFactory.cs @@ -30,7 +30,7 @@ namespace Spring.Context.Attributes.TypeFilters /// public static class CustomTypeFactory { - private static readonly ILog Logger = LogManager.GetLogger(typeof(CustomTypeFactory).FullName); + private static readonly ILogger Logger = LogManager.GetLogger(typeof(CustomTypeFactory).FullName); /// /// Creates a new instance of given type filter type string diff --git a/src/Spring/Spring.Core/Context/Config/ComponentScanObjectDefinitionParser.cs b/src/Spring/Spring.Core/Context/Config/ComponentScanObjectDefinitionParser.cs index 9024c8a0..f733e373 100644 --- a/src/Spring/Spring.Core/Context/Config/ComponentScanObjectDefinitionParser.cs +++ b/src/Spring/Spring.Core/Context/Config/ComponentScanObjectDefinitionParser.cs @@ -34,7 +34,7 @@ namespace Spring.Context.Config /// public class ComponentScanObjectDefinitionParser : IObjectDefinitionParser { - private static readonly ILog Logger = LogManager.GetLogger(); + private static readonly ILogger Logger = LogManager.GetLogger(); private const string ATTRIBUTE_CONFIG_ATTRIBUTE = "attribute-config"; diff --git a/src/Spring/Spring.Core/Context/Support/AbstractApplicationContext.cs b/src/Spring/Spring.Core/Context/Support/AbstractApplicationContext.cs index 6689fd7c..c4fe85a0 100644 --- a/src/Spring/Spring.Core/Context/Support/AbstractApplicationContext.cs +++ b/src/Spring/Spring.Core/Context/Support/AbstractApplicationContext.cs @@ -107,9 +107,9 @@ namespace Spring.Context.Support public static readonly string EventRegistryObjectName = "eventRegistry"; /// - /// The instance for this class. + /// The instance for this class. /// - protected readonly ILog log; + protected readonly ILogger log; /// /// The instance we delegate @@ -2352,7 +2352,7 @@ namespace Spring.Context.Support private sealed class ObjectPostProcessorChecker : IObjectPostProcessor, IOrdered { - private static readonly ILog log = LogManager.GetLogger(); + private static readonly ILogger log = LogManager.GetLogger(); private int _objectPostProcessorTargetCount; private IConfigurableListableObjectFactory _objectFactory; diff --git a/src/Spring/Spring.Core/Context/Support/AbstractMessageSource.cs b/src/Spring/Spring.Core/Context/Support/AbstractMessageSource.cs index 5f049e62..1148f04c 100644 --- a/src/Spring/Spring.Core/Context/Support/AbstractMessageSource.cs +++ b/src/Spring/Spring.Core/Context/Support/AbstractMessageSource.cs @@ -19,6 +19,7 @@ #endregion using System.Globalization; +using Microsoft.Extensions.Logging; namespace Spring.Context.Support { @@ -60,7 +61,7 @@ namespace Spring.Context.Support /// /// holds the logger instance shared with subclasses. /// - protected readonly ILog log; + protected readonly ILogger log; private IMessageSource parentMessageSource; private bool useCodeAsDefaultMessage = false; diff --git a/src/Spring/Spring.Core/Context/Support/ContextHandler.cs b/src/Spring/Spring.Core/Context/Support/ContextHandler.cs index 680fda64..f8be41c8 100644 --- a/src/Spring/Spring.Core/Context/Support/ContextHandler.cs +++ b/src/Spring/Spring.Core/Context/Support/ContextHandler.cs @@ -170,7 +170,7 @@ namespace Spring.Context.Support /// public class ContextHandler : IConfigurationSectionHandler { - private static readonly ILog Log = LogManager.GetLogger(typeof(ContextHandler)); + private static readonly ILogger Log = LogManager.GetLogger(); /// /// The of diff --git a/src/Spring/Spring.Core/Context/Support/ContextRegistry.cs b/src/Spring/Spring.Core/Context/Support/ContextRegistry.cs index 29b8f2d6..46478f90 100644 --- a/src/Spring/Spring.Core/Context/Support/ContextRegistry.cs +++ b/src/Spring/Spring.Core/Context/Support/ContextRegistry.cs @@ -45,9 +45,9 @@ namespace Spring.Context.Support public sealed class ContextRegistry { /// - /// The shared instance for this class (and derived classes). + /// The shared instance for this class (and derived classes). /// - private static readonly ILog log = LogManager.GetLogger(typeof(ContextRegistry)); + private static readonly ILogger log = LogManager.GetLogger(); private static readonly object syncRoot = new Object(); private static readonly ContextRegistry instance = new ContextRegistry(); diff --git a/src/Spring/Spring.Core/Core/IO/AssemblyResource.cs b/src/Spring/Spring.Core/Core/IO/AssemblyResource.cs index aa2beb84..f6115363 100644 --- a/src/Spring/Spring.Core/Core/IO/AssemblyResource.cs +++ b/src/Spring/Spring.Core/Core/IO/AssemblyResource.cs @@ -53,7 +53,7 @@ namespace Spring.Core.IO private string _fullResourceName; private string _resourceNamespace; private string _resourceAssemblyName; - private static readonly ILog log = LogManager.GetLogger(typeof(AssemblyResource)); + private static readonly ILogger log = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Core/Core/IO/ResourceConverter.cs b/src/Spring/Spring.Core/Core/IO/ResourceConverter.cs index 4c67d87b..c7c86990 100644 --- a/src/Spring/Spring.Core/Core/IO/ResourceConverter.cs +++ b/src/Spring/Spring.Core/Core/IO/ResourceConverter.cs @@ -64,7 +64,7 @@ namespace Spring.Core.IO /// public class ResourceConverter : TypeConverter { - private static readonly ILog _log = LogManager.GetLogger(typeof (ResourceConverter)); + private static readonly ILogger _log = LogManager.GetLogger(); private IResourceLoader _resourceLoader; #region Constructor (s) / Destructor diff --git a/src/Spring/Spring.Core/DataBinding/AbstractSimpleBinding.cs b/src/Spring/Spring.Core/DataBinding/AbstractSimpleBinding.cs index 153767b6..fd85c2df 100644 --- a/src/Spring/Spring.Core/DataBinding/AbstractSimpleBinding.cs +++ b/src/Spring/Spring.Core/DataBinding/AbstractSimpleBinding.cs @@ -13,7 +13,7 @@ namespace Spring.DataBinding { #region Fields - private readonly ILog log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + private readonly ILogger log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private IFormatter formatter; #endregion diff --git a/src/Spring/Spring.Core/Globalization/Localizers/ResourceSetLocalizer.cs b/src/Spring/Spring.Core/Globalization/Localizers/ResourceSetLocalizer.cs index 9d5db1a7..48d6e25e 100644 --- a/src/Spring/Spring.Core/Globalization/Localizers/ResourceSetLocalizer.cs +++ b/src/Spring/Spring.Core/Globalization/Localizers/ResourceSetLocalizer.cs @@ -44,7 +44,7 @@ namespace Spring.Globalization.Localizers /// Aleksandar Seovic public class ResourceSetLocalizer : AbstractLocalizer { - private static readonly ILog log = LogManager.GetLogger(typeof(ResourceSetLocalizer)); + private static readonly ILogger log = LogManager.GetLogger(); private static readonly IList ignoreList = new string[] {"$this.DefaultModifiers", "$this.TrayAutoArrange", "$this.TrayLargeIcon"}; diff --git a/src/Spring/Spring.Core/Objects/Factory/Attributes/AutowiredAttributeObjectPostProcessor.cs b/src/Spring/Spring.Core/Objects/Factory/Attributes/AutowiredAttributeObjectPostProcessor.cs index 5afdfee9..38c49ae3 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Attributes/AutowiredAttributeObjectPostProcessor.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Attributes/AutowiredAttributeObjectPostProcessor.cs @@ -65,7 +65,7 @@ namespace Spring.Objects.Factory.Attributes public class AutowiredAttributeObjectPostProcessor : InstantiationAwareObjectPostProcessorAdapter, IMergedObjectDefinitionPostProcessor, IObjectFactoryAware, IOrdered { - private static readonly ILog logger = LogManager.GetLogger(); + private static readonly ILogger logger = LogManager.GetLogger(); private IConfigurableListableObjectFactory objectFactory; diff --git a/src/Spring/Spring.Core/Objects/Factory/Attributes/InitDestroyAttributeObjectPostProcessor.cs b/src/Spring/Spring.Core/Objects/Factory/Attributes/InitDestroyAttributeObjectPostProcessor.cs index 477ac969..16512278 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Attributes/InitDestroyAttributeObjectPostProcessor.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Attributes/InitDestroyAttributeObjectPostProcessor.cs @@ -38,7 +38,7 @@ namespace Spring.Objects.Factory.Attributes /// public class InitDestroyAttributeObjectPostProcessor : IDestructionAwareObjectPostProcessor, IObjectFactoryAware, IOrdered { - private static readonly ILog logger = LogManager.GetLogger(); + private static readonly ILogger logger = LogManager.GetLogger(); private IConfigurableListableObjectFactory objectFactory; private readonly IDictionary lifecycleMetadataCache; diff --git a/src/Spring/Spring.Core/Objects/Factory/Attributes/InjectionMetadata.cs b/src/Spring/Spring.Core/Objects/Factory/Attributes/InjectionMetadata.cs index 3e060875..3692869d 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Attributes/InjectionMetadata.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Attributes/InjectionMetadata.cs @@ -30,7 +30,7 @@ namespace Spring.Objects.Factory.Attributes /// public class InjectionMetadata { - private static readonly ILog Logger = LogManager.GetLogger(); + private static readonly ILogger Logger = LogManager.GetLogger(); private readonly Type targetType; private readonly IList _injectedElements; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/ConfigurationReader.cs b/src/Spring/Spring.Core/Objects/Factory/Config/ConfigurationReader.cs index fb2462ce..273bca17 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/ConfigurationReader.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/ConfigurationReader.cs @@ -23,8 +23,7 @@ using System.Configuration; using System.Reflection; using System.Runtime.InteropServices; using System.Xml; - - +using Microsoft.Extensions.Logging; using Spring.Core.IO; using Spring.Core.TypeResolution; using Spring.Util; @@ -52,7 +51,7 @@ namespace Spring.Objects.Factory.Config private const string ConfigSectionElement = "section"; private const string ConfigSectionNameAttribute = "name"; - private static readonly ILog _log = LogManager.GetLogger(typeof(ConfigurationReader)); + private static readonly ILogger _log = LogManager.GetLogger(); /// /// Initializes the type members diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/LogFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Config/LogFactoryObject.cs index 3b6b9a34..aec48ef1 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/LogFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/LogFactoryObject.cs @@ -18,17 +18,18 @@ #endregion +using Microsoft.Extensions.Logging; using Spring.Util; namespace Spring.Objects.Factory.Config { /// /// implementation that - /// creates instances of the class. + /// creates instances of the class. /// /// ///

- /// Typically used for retrieving shared + /// Typically used for retrieving shared /// instances for common topics (such as the 'DAL', 'BLL', etc). The /// /// property determines the name of the @@ -57,7 +58,7 @@ namespace Spring.Objects.Factory.Config /// class. ///

/// - /// The name of the instance served up by + /// The name of the instance served up by /// this factory. /// /// @@ -72,11 +73,11 @@ namespace Spring.Objects.Factory.Config #endregion /// - /// The name of the instance served up by + /// The name of the instance served up by /// this factory. /// /// - /// The name of the instance served up by + /// The name of the instance served up by /// this factory. /// /// @@ -120,7 +121,7 @@ namespace Spring.Objects.Factory.Config /// public Type ObjectType { - get { return typeof(ILog); } + get { return typeof(ILogger); } } /// @@ -158,7 +159,7 @@ namespace Spring.Objects.Factory.Config } } - private ILog log; + private ILogger log; private string logName; } } diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyOverrideConfigurer.cs b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyOverrideConfigurer.cs index 04f3160c..619cf77d 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyOverrideConfigurer.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyOverrideConfigurer.cs @@ -103,7 +103,7 @@ namespace Spring.Objects.Factory.Config [Serializable] public class PropertyOverrideConfigurer : PropertyResourceConfigurer { - private static readonly ILog _logger = LogManager.GetLogger(typeof (PropertyOverrideConfigurer)); + private static readonly ILogger _logger = LogManager.GetLogger(); /// /// Apply the given properties to the supplied diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyPlaceholderConfigurer.cs b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyPlaceholderConfigurer.cs index 2bc5dd34..f37ecc5b 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyPlaceholderConfigurer.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyPlaceholderConfigurer.cs @@ -146,7 +146,7 @@ namespace Spring.Objects.Factory.Config public static readonly string DefaultPlaceholderSuffix = "}"; - private readonly ILog logger; + private readonly ILogger logger; private bool ignoreUnresolvablePlaceholders = false; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyResourceConfigurer.cs b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyResourceConfigurer.cs index e2a569ca..590fba5f 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/PropertyResourceConfigurer.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/PropertyResourceConfigurer.cs @@ -76,7 +76,7 @@ namespace Spring.Objects.Factory.Config #region Fields - private readonly ILog _log; + private readonly ILogger _log; private int _order = Int32.MaxValue; // default: same as non-Ordered private NameValueCollection _defaultProperties; diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/SharedStateAwareProcessor.cs b/src/Spring/Spring.Core/Objects/Factory/Config/SharedStateAwareProcessor.cs index 2dc62c58..365f7b6a 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/SharedStateAwareProcessor.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/SharedStateAwareProcessor.cs @@ -19,7 +19,6 @@ #endregion using System.Collections; - using Spring.Core; using Spring.Util; @@ -30,8 +29,6 @@ namespace Spring.Objects.Factory.Config /// public class SharedStateAwareProcessor : IObjectPostProcessor, IOrdered { - // holds the logger for this processor instance - private readonly ILog Log = LogManager.GetLogger( typeof( SharedStateAwareProcessor ) ); // holds a list of ISharedStateProvider instances (if any) private ISharedStateFactory[] _sharedStateFactories = new ISharedStateFactory[0]; // holds prio diff --git a/src/Spring/Spring.Core/Objects/Factory/Config/VariablePlaceholderConfigurer.cs b/src/Spring/Spring.Core/Objects/Factory/Config/VariablePlaceholderConfigurer.cs index f62d654c..f55d0e25 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Config/VariablePlaceholderConfigurer.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Config/VariablePlaceholderConfigurer.cs @@ -253,7 +253,7 @@ namespace Spring.Objects.Factory.Config private class TextProcessor { - private readonly ILog logger = LogManager.GetLogger(typeof(TextProcessor)); + private readonly ILogger logger = LogManager.GetLogger(); private readonly VariablePlaceholderConfigurer owner; private readonly IVariableSource variableSource; diff --git a/src/Spring/Spring.Core/Objects/Factory/Parsing/FailFastProblemReporter.cs b/src/Spring/Spring.Core/Objects/Factory/Parsing/FailFastProblemReporter.cs index e40d5970..be2a6c5a 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Parsing/FailFastProblemReporter.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Parsing/FailFastProblemReporter.cs @@ -24,9 +24,9 @@ namespace Spring.Objects.Factory.Parsing { public class FailFastProblemReporter : IProblemReporter { - private static readonly ILog _logger = LogManager.GetLogger(typeof(FailFastProblemReporter)); + private static readonly ILogger _logger = LogManager.GetLogger(); - public ILog Logger + public ILogger Logger { get { return _logger; } } diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectDefinitionReader.cs b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectDefinitionReader.cs index 180150cf..3e56c9a0 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectDefinitionReader.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectDefinitionReader.cs @@ -39,9 +39,9 @@ namespace Spring.Objects.Factory.Support #region Constants /// - /// The instance for this class (and derived classes). + /// The instance for this class (and derived classes). /// - protected readonly ILog log; + protected readonly ILogger log; #endregion diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectFactory.cs index 04ac5286..ec89c220 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectFactory.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectFactory.cs @@ -63,9 +63,9 @@ namespace Spring.Objects.Factory.Support private static readonly object EmptyObject = new object(); /// - /// The instance for this class. + /// The instance for this class. /// - [NonSerialized] protected ILog log; + [NonSerialized] protected ILogger log; /// /// Cache of singleton objects created by s: FactoryObject name -> product diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/ConstructorResolver.cs b/src/Spring/Spring.Core/Objects/Factory/Support/ConstructorResolver.cs index 97a3b0ff..2dba0a26 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/ConstructorResolver.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/ConstructorResolver.cs @@ -37,7 +37,7 @@ namespace Spring.Objects.Factory.Support /// Mark Pollack public class ConstructorResolver { - private readonly ILog log = LogManager.GetLogger(typeof(ConstructorResolver)); + private readonly ILogger log = LogManager.GetLogger(); private readonly AbstractObjectFactory objectFactory; diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/DisposableObjectAdapter.cs b/src/Spring/Spring.Core/Objects/Factory/Support/DisposableObjectAdapter.cs index 240132fa..8f1771e1 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/DisposableObjectAdapter.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/DisposableObjectAdapter.cs @@ -7,7 +7,7 @@ namespace Spring.Objects.Factory.Support { public class DisposableObjectAdapter : IDisposable { - private readonly ILog logger = LogManager.GetLogger(typeof(DisposableObjectAdapter)); + private readonly ILogger logger = LogManager.GetLogger(); private object instance; diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionValueResolver.cs b/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionValueResolver.cs index af7178eb..b1ae6af8 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionValueResolver.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionValueResolver.cs @@ -36,7 +36,7 @@ namespace Spring.Objects.Factory.Support /// Mark Pollack (.NET) public class ObjectDefinitionValueResolver { - private readonly ILog log; + private readonly ILogger log; private readonly AbstractObjectFactory objectFactory; diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/SimpleInstantiationStrategy.cs b/src/Spring/Spring.Core/Objects/Factory/Support/SimpleInstantiationStrategy.cs index 2f822d6e..19687d38 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/SimpleInstantiationStrategy.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/SimpleInstantiationStrategy.cs @@ -43,10 +43,9 @@ namespace Spring.Objects.Factory.Support public class SimpleInstantiationStrategy : IInstantiationStrategy { /// - /// The shared instance for this class (and derived classes). + /// The shared instance for this class (and derived classes). /// - protected static readonly ILog log = - LogManager.GetLogger(typeof(SimpleInstantiationStrategy)); + protected static readonly ILogger log = LogManager.GetLogger(); /// /// Instantiate an instance of the object described by the supplied diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/DefaultObjectDefinitionDocumentReader.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/DefaultObjectDefinitionDocumentReader.cs index a8e761b8..ce8a106f 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/DefaultObjectDefinitionDocumentReader.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/DefaultObjectDefinitionDocumentReader.cs @@ -38,10 +38,9 @@ namespace Spring.Objects.Factory.Xml public class DefaultObjectDefinitionDocumentReader : IObjectDefinitionDocumentReader { /// - /// The shared instance for this class (and derived classes). + /// The shared instance for this class (and derived classes). /// - protected static readonly ILog log = - LogManager.GetLogger(typeof(DefaultObjectDefinitionDocumentReader)); + protected static readonly ILogger log = LogManager.GetLogger(); private XmlReaderContext readerContext; diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectDefinitionParserHelper.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectDefinitionParserHelper.cs index 896b2a67..a68471b2 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectDefinitionParserHelper.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectDefinitionParserHelper.cs @@ -41,9 +41,9 @@ namespace Spring.Objects.Factory.Xml #region Fields /// - /// The shared instance for this class (and derived classes). + /// The shared instance for this class (and derived classes). /// - protected readonly ILog log; + protected readonly ILogger log; private DocumentDefaultsDefinition defaults; diff --git a/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectsNamespaceParser.cs b/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectsNamespaceParser.cs index b2fc0bee..e25eea1a 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectsNamespaceParser.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Xml/ObjectsNamespaceParser.cs @@ -68,10 +68,9 @@ namespace Spring.Objects.Factory.Xml public const string Namespace = "http://www.springframework.net"; /// - /// The shared instance for this class (and derived classes). + /// The shared instance for this class (and derived classes). /// - protected static readonly ILog log = - LogManager.GetLogger(typeof(ObjectsNamespaceParser)); + protected static readonly ILogger log = LogManager.GetLogger(); #region IXmlObjectDefinitionParser Members diff --git a/src/Spring/Spring.Core/Objects/ObjectWrapper.cs b/src/Spring/Spring.Core/Objects/ObjectWrapper.cs index ec2133f9..9857753f 100644 --- a/src/Spring/Spring.Core/Objects/ObjectWrapper.cs +++ b/src/Spring/Spring.Core/Objects/ObjectWrapper.cs @@ -49,7 +49,7 @@ namespace Spring.Objects [Serializable] public class ObjectWrapper : IObjectWrapper { - private static readonly ILog Log = LogManager.GetLogger(typeof(ObjectWrapper)); + private static readonly ILogger Log = LogManager.GetLogger(); /// The wrapped object. private object wrappedObject; diff --git a/src/Spring/Spring.Core/Objects/Support/AutoWiringEventHandlerValue.cs b/src/Spring/Spring.Core/Objects/Support/AutoWiringEventHandlerValue.cs index bbc1605e..55da5f14 100644 --- a/src/Spring/Spring.Core/Objects/Support/AutoWiringEventHandlerValue.cs +++ b/src/Spring/Spring.Core/Objects/Support/AutoWiringEventHandlerValue.cs @@ -41,8 +41,7 @@ namespace Spring.Objects.Support private const string DefaultMethodName = DefaultMethodPrefix + EventNamePlaceHolder; - private static readonly ILog log - = LogManager.GetLogger(typeof (AutoWiringEventHandlerValue)); + private static readonly ILogger log = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Core/Objects/Support/PropertyComparator.cs b/src/Spring/Spring.Core/Objects/Support/PropertyComparator.cs index 6d311547..c3bc15a9 100644 --- a/src/Spring/Spring.Core/Objects/Support/PropertyComparator.cs +++ b/src/Spring/Spring.Core/Objects/Support/PropertyComparator.cs @@ -35,8 +35,7 @@ namespace Spring.Objects.Support /// Simon White (.NET) public class PropertyComparator : IComparer { - private static readonly ILog logger - = LogManager.GetLogger(typeof (PropertyComparator)); + private static readonly ILogger logger = LogManager.GetLogger(); private ISortDefinition sortDefinition; private readonly IDictionary cachedObjectWrappers = new Hashtable(); diff --git a/src/Spring/Spring.Core/Proxy/AbstractProxyTypeBuilder.cs b/src/Spring/Spring.Core/Proxy/AbstractProxyTypeBuilder.cs index c96980fa..bc9c4698 100644 --- a/src/Spring/Spring.Core/Proxy/AbstractProxyTypeBuilder.cs +++ b/src/Spring/Spring.Core/Proxy/AbstractProxyTypeBuilder.cs @@ -24,6 +24,7 @@ using System.Collections; using System.Reflection; using System.Reflection.Emit; using System.Runtime.Serialization; +using Microsoft.Extensions.Logging; using Spring.Core.TypeResolution; using Spring.Util; @@ -50,9 +51,9 @@ namespace Spring.Proxy #region Fields /// - /// The shared instance for this class (and derived classes). + /// The shared instance for this class (and derived classes). /// - protected static readonly ILog log = LogManager.GetLogger(typeof(AbstractProxyTypeBuilder)); + protected static readonly ILogger log = LogManager.GetLogger(); private const string DEFAULT_PROXY_TYPE_NAME = "Proxy"; diff --git a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicProperty.cs b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicProperty.cs index c85a17df..3ecf62a1 100644 --- a/src/Spring/Spring.Core/Reflection/Dynamic/DynamicProperty.cs +++ b/src/Spring/Spring.Core/Reflection/Dynamic/DynamicProperty.cs @@ -19,8 +19,6 @@ #endregion using System.Reflection; - - using Spring.Util; namespace Spring.Reflection.Dynamic @@ -93,8 +91,6 @@ namespace Spring.Reflection.Dynamic /// public class SafeProperty : IDynamicProperty { - private static readonly ILog Log = LogManager.GetLogger(typeof(SafeProperty)); - private readonly PropertyInfo propertyInfo; #region Cache diff --git a/src/Spring/Spring.Core/Util/EventUtils.cs b/src/Spring/Spring.Core/Util/EventUtils.cs index 960e1675..6d35d2b6 100644 --- a/src/Spring/Spring.Core/Util/EventUtils.cs +++ b/src/Spring/Spring.Core/Util/EventUtils.cs @@ -70,7 +70,7 @@ namespace Spring.Util } } - protected readonly ILog Log; + protected readonly ILogger Log; /// /// Create a new EventRaiser instance diff --git a/src/Spring/Spring.Core/Util/ObjectUtils.cs b/src/Spring/Spring.Core/Util/ObjectUtils.cs index cf24d0a1..1fe167e0 100644 --- a/src/Spring/Spring.Core/Util/ObjectUtils.cs +++ b/src/Spring/Spring.Core/Util/ObjectUtils.cs @@ -41,9 +41,9 @@ namespace Spring.Util public sealed class ObjectUtils { /// - /// The instance for this class. + /// The instance for this class. /// - private static readonly ILog log = LogManager.GetLogger(typeof(ObjectUtils)); + private static readonly ILogger log = LogManager.GetLogger(); /// /// An empty object array. diff --git a/src/Spring/Spring.Core/Validation/Actions/ExceptionAction.cs b/src/Spring/Spring.Core/Validation/Actions/ExceptionAction.cs index f71784b5..fcce249a 100644 --- a/src/Spring/Spring.Core/Validation/Actions/ExceptionAction.cs +++ b/src/Spring/Spring.Core/Validation/Actions/ExceptionAction.cs @@ -25,7 +25,7 @@ namespace Spring.Validation.Actions { public class ExceptionAction : BaseValidationAction { - private static readonly ILog log = LogManager.GetLogger(typeof(ExceptionAction)); + private static readonly ILogger log = LogManager.GetLogger(); private IExpression throwsExpression; /// diff --git a/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/Bytecode/ProxyFactory.cs b/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/Bytecode/ProxyFactory.cs index ebb11262..6609b922 100644 --- a/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/Bytecode/ProxyFactory.cs +++ b/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/Bytecode/ProxyFactory.cs @@ -29,7 +29,7 @@ namespace Spring.Data.NHibernate.Bytecode /// Erich Eichinger public class ProxyFactory : AbstractProxyFactory { - private static readonly ILog log = LogManager.GetLogger(typeof(ProxyFactory)); + private static readonly ILogger log = LogManager.GetLogger(); [Serializable] private class SerializableProxyFactory : global::Spring.Aop.Framework.ProxyFactory diff --git a/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/HibernateAccessor.cs b/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/HibernateAccessor.cs index 53363deb..073ba6b1 100644 --- a/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/HibernateAccessor.cs +++ b/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/HibernateAccessor.cs @@ -45,9 +45,9 @@ namespace Spring.Data.NHibernate private Type criteriaType; /// - /// The instance for this class. + /// The instance for this class. /// - private readonly ILog log = LogManager.GetLogger(typeof (HibernateAccessor)); + private readonly ILogger log = LogManager.GetLogger(); /// /// Initializes a new instance of the class. diff --git a/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/HibernateTemplate.cs b/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/HibernateTemplate.cs index 26ebd147..98f619f2 100644 --- a/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/HibernateTemplate.cs +++ b/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/HibernateTemplate.cs @@ -66,9 +66,9 @@ namespace Spring.Data.NHibernate public class HibernateTemplate : HibernateAccessor, IHibernateOperations { /// - /// The instance for this class. + /// The instance for this class. /// - private readonly ILog log = LogManager.GetLogger(typeof (HibernateTemplate)); + private readonly ILogger log = LogManager.GetLogger(); private bool checkWriteOperations = true; diff --git a/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/LocalSessionFactoryObject.cs b/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/LocalSessionFactoryObject.cs index 30dc8eb2..b24adcc7 100644 --- a/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/LocalSessionFactoryObject.cs +++ b/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/LocalSessionFactoryObject.cs @@ -109,10 +109,9 @@ namespace Spring.Data.NHibernate private IBytecodeProvider bytecodeProvider; /// - /// The shared instance for this class (and derived classes). + /// The shared instance for this class (and derived classes). /// - protected static readonly ILog log = - LogManager.GetLogger(typeof (LocalSessionFactoryObject)); + protected static readonly ILogger log = LogManager.GetLogger(); /// /// Initializes a new instance of the class. diff --git a/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/SessionFactoryUtils.cs b/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/SessionFactoryUtils.cs index b7c58aa6..7bacdc56 100644 --- a/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/SessionFactoryUtils.cs +++ b/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/SessionFactoryUtils.cs @@ -41,9 +41,9 @@ namespace Spring.Data.NHibernate public abstract class SessionFactoryUtils { /// - /// The instance for this class. + /// The instance for this class. /// - private static readonly ILog log = LogManager.GetLogger(typeof(SessionFactoryUtils)); + private static readonly ILogger log = LogManager.GetLogger(); /// /// The ordering value for synchronizaiton this session resources. diff --git a/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/SessionHolder.cs b/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/SessionHolder.cs index 2c4ff8ec..b1729b9d 100644 --- a/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/SessionHolder.cs +++ b/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/SessionHolder.cs @@ -49,7 +49,7 @@ namespace Spring.Data.NHibernate //needed to see if we actually assigned the enum value... private bool assignedPreviousFlushMode = false; - private static readonly ILog log = LogManager.GetLogger(typeof (SessionHolder)); + private static readonly ILogger log = LogManager.GetLogger(); /// /// May be used by derived classes to create an empty SessionHolder. diff --git a/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/SpringSessionSynchronization.cs b/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/SpringSessionSynchronization.cs index d43dd86b..9f877a07 100644 --- a/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/SpringSessionSynchronization.cs +++ b/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/SpringSessionSynchronization.cs @@ -30,9 +30,9 @@ namespace Spring.Data.NHibernate public class SpringSessionSynchronization : TransactionSynchronizationAdapter, IOrdered { /// - /// The instance for this class. + /// The instance for this class. /// - private readonly ILog log = LogManager.GetLogger(typeof(SpringSessionSynchronization)); + private readonly ILogger log = LogManager.GetLogger(); private readonly SessionHolder sessionHolder; diff --git a/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/Support/SessionScope.cs b/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/Support/SessionScope.cs index ac941b6c..462fbeef 100644 --- a/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/Support/SessionScope.cs +++ b/src/Spring/Spring.Data.NHibernate5/Data/NHibernate/Support/SessionScope.cs @@ -57,7 +57,7 @@ namespace Spring.Data.NHibernate.Support /// /// The logging instance. /// - protected readonly ILog log = LogManager.GetLogger(MethodInfo.GetCurrentMethod().DeclaringType); + protected readonly ILogger log = LogManager.GetLogger(MethodInfo.GetCurrentMethod().DeclaringType); private readonly SessionScopeSettings settings; @@ -415,7 +415,7 @@ namespace Spring.Data.NHibernate.Support /// private class LazySessionHolder : SessionHolder { - private readonly ILog log = LogManager.GetLogger(typeof(LazySessionHolder)); + private readonly ILogger log = LogManager.GetLogger(); private SessionScope owner; private ISession session; diff --git a/src/Spring/Spring.Data/Dao/Support/DaoSupport.cs b/src/Spring/Spring.Data/Dao/Support/DaoSupport.cs index c74cdac1..46d8410f 100644 --- a/src/Spring/Spring.Data/Dao/Support/DaoSupport.cs +++ b/src/Spring/Spring.Data/Dao/Support/DaoSupport.cs @@ -18,6 +18,7 @@ #endregion +using Microsoft.Extensions.Logging; using Spring.Objects.Factory; namespace Spring.Dao.Support @@ -39,10 +40,9 @@ namespace Spring.Dao.Support #region Constants /// - /// The shared instance for this class (and derived classes). + /// The shared instance for this class (and derived classes). /// - protected static readonly ILog log = - LogManager.GetLogger(typeof (DaoSupport)); + protected static readonly ILogger log = LogManager.GetLogger(typeof (DaoSupport)); #endregion diff --git a/src/Spring/Spring.Data/Data/Common/DbParametersBuilder.cs b/src/Spring/Spring.Data/Data/Common/DbParametersBuilder.cs index c351eb6a..a668daa6 100644 --- a/src/Spring/Spring.Data/Data/Common/DbParametersBuilder.cs +++ b/src/Spring/Spring.Data/Data/Common/DbParametersBuilder.cs @@ -39,16 +39,6 @@ namespace Spring.Data.Common #endregion - #region Constants - - /// - /// The shared log instance for this class (and derived classes). - /// - protected static readonly ILog log = - LogManager.GetLogger(typeof (DbParametersBuilder)); - - #endregion - #region Constructor (s) /// @@ -62,10 +52,6 @@ namespace Spring.Data.Common #endregion - #region Properties - - #endregion - #region Methods public IDbParameter Create() diff --git a/src/Spring/Spring.Data/Data/Common/DbProviderConfigurer.cs b/src/Spring/Spring.Data/Data/Common/DbProviderConfigurer.cs index cc269533..150436d1 100644 --- a/src/Spring/Spring.Data/Data/Common/DbProviderConfigurer.cs +++ b/src/Spring/Spring.Data/Data/Common/DbProviderConfigurer.cs @@ -18,6 +18,7 @@ #endregion +using Microsoft.Extensions.Logging; using Spring.Core; using Spring.Core.IO; using Spring.Objects.Factory.Config; @@ -32,7 +33,7 @@ namespace Spring.Data.Common { #region Fields - private static readonly ILog log = LogManager.GetLogger(typeof(DbProviderConfigurer)); + private static readonly ILogger log = LogManager.GetLogger(); private int order = Int32.MinValue; diff --git a/src/Spring/Spring.Data/Data/Common/DbProviderFactory.cs b/src/Spring/Spring.Data/Data/Common/DbProviderFactory.cs index 3e71655e..af0dbd72 100644 --- a/src/Spring/Spring.Data/Data/Common/DbProviderFactory.cs +++ b/src/Spring/Spring.Data/Data/Common/DbProviderFactory.cs @@ -38,7 +38,7 @@ namespace Spring.Data.Common /// /// The shared log instance for this class (and derived classes). /// - protected static ILog log = LogManager.GetLogger(typeof(DbProviderFactory)); + protected static ILogger log = LogManager.GetLogger(); private static readonly string DBPROVIDER_DEFAULT_RESOURCE_NAME = "assembly://" + typeof(DbProviderFactory).Assembly.FullName + "/Spring.Data.Common/dbproviders.xml"; diff --git a/src/Spring/Spring.Data/Data/Common/ErrorCodes.cs b/src/Spring/Spring.Data/Data/Common/ErrorCodes.cs index 455ea63d..d855ff48 100644 --- a/src/Spring/Spring.Data/Data/Common/ErrorCodes.cs +++ b/src/Spring/Spring.Data/Data/Common/ErrorCodes.cs @@ -18,7 +18,6 @@ #endregion - namespace Spring.Data.Common { /// @@ -58,16 +57,6 @@ namespace Spring.Data.Common // CustomErrorCodesTranslation[] customTranslations; #endregion - #region Constants - - /// - /// The shared log instance for this class (and derived classes). - /// - protected static readonly ILog log = - LogManager.GetLogger(typeof (ErrorCodes)); - - #endregion - #region Constructor (s) /// /// Initializes a new instance of the class. diff --git a/src/Spring/Spring.Data/Data/Common/MultiDelegatingDbProvider.cs b/src/Spring/Spring.Data/Data/Common/MultiDelegatingDbProvider.cs index 59b4a5f4..50c8daae 100644 --- a/src/Spring/Spring.Data/Data/Common/MultiDelegatingDbProvider.cs +++ b/src/Spring/Spring.Data/Data/Common/MultiDelegatingDbProvider.cs @@ -50,7 +50,7 @@ namespace Spring.Data.Common #region Logging Definition - private static readonly ILog LOG = LogManager.GetLogger(typeof(MultiDelegatingDbProvider)); + private static readonly ILogger LOG = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Data/Data/Core/AdoPlatformTransactionManager.cs b/src/Spring/Spring.Data/Data/Core/AdoPlatformTransactionManager.cs index 71e598a8..c02512d1 100644 --- a/src/Spring/Spring.Data/Data/Core/AdoPlatformTransactionManager.cs +++ b/src/Spring/Spring.Data/Data/Core/AdoPlatformTransactionManager.cs @@ -40,7 +40,7 @@ namespace Spring.Data.Core #region Logging Definition - private static readonly ILog LOG = LogManager.GetLogger(typeof (AdoPlatformTransactionManager)); + private static readonly ILogger LOG = LogManager.GetLogger(typeof (AdoPlatformTransactionManager)); #endregion diff --git a/src/Spring/Spring.Data/Data/Core/AdoTemplate.cs b/src/Spring/Spring.Data/Data/Core/AdoTemplate.cs index 3978d59a..d89b60b0 100644 --- a/src/Spring/Spring.Data/Data/Core/AdoTemplate.cs +++ b/src/Spring/Spring.Data/Data/Core/AdoTemplate.cs @@ -41,7 +41,7 @@ namespace Spring.Data.Core { #region Logging Definition - private static readonly ILog LOG = LogManager.GetLogger(typeof(AdoTemplate)); + private static readonly ILogger LOG = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Data/Data/Generic/AdoTemplate.cs b/src/Spring/Spring.Data/Data/Generic/AdoTemplate.cs index 56e92b55..115801ac 100644 --- a/src/Spring/Spring.Data/Data/Generic/AdoTemplate.cs +++ b/src/Spring/Spring.Data/Data/Generic/AdoTemplate.cs @@ -41,7 +41,7 @@ namespace Spring.Data.Generic #region Logging Definition - private static readonly ILog LOG = LogManager.GetLogger(typeof(AdoTemplate)); + private static readonly ILogger LOG = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Data/Data/Objects/AbstractAdoOperation.cs b/src/Spring/Spring.Data/Data/Objects/AbstractAdoOperation.cs index 407eeeac..2fec9c09 100644 --- a/src/Spring/Spring.Data/Data/Objects/AbstractAdoOperation.cs +++ b/src/Spring/Spring.Data/Data/Objects/AbstractAdoOperation.cs @@ -36,7 +36,7 @@ namespace Spring.Data.Objects { #region Logging Definition - protected readonly ILog log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); + protected readonly ILogger log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); #endregion diff --git a/src/Spring/Spring.Data/Data/Support/AdoTransactionObjectSupport.cs b/src/Spring/Spring.Data/Data/Support/AdoTransactionObjectSupport.cs index 64ca6f93..467d4a0c 100644 --- a/src/Spring/Spring.Data/Data/Support/AdoTransactionObjectSupport.cs +++ b/src/Spring/Spring.Data/Data/Support/AdoTransactionObjectSupport.cs @@ -43,16 +43,6 @@ namespace Spring.Data.Support #endregion - #region Constants - - /// - /// The shared log instance for this class (and derived classes). - /// - protected static readonly ILog log = - LogManager.GetLogger(typeof (AdoTransactionObjectSupport)); - - #endregion - #region Properties public ConnectionHolder ConnectionHolder diff --git a/src/Spring/Spring.Data/Data/Support/AdoUtils.cs b/src/Spring/Spring.Data/Data/Support/AdoUtils.cs index c5aa9074..6e2c1e37 100644 --- a/src/Spring/Spring.Data/Data/Support/AdoUtils.cs +++ b/src/Spring/Spring.Data/Data/Support/AdoUtils.cs @@ -10,7 +10,7 @@ namespace Spring.Data.Support { #region Logging - private static readonly ILog LOG = LogManager.GetLogger(typeof (AdoUtils)); + private static readonly ILogger LOG = LogManager.GetLogger(typeof (AdoUtils)); #endregion diff --git a/src/Spring/Spring.Data/Data/Support/ConnectionUtils.cs b/src/Spring/Spring.Data/Data/Support/ConnectionUtils.cs index 6912bcdc..a10e3199 100644 --- a/src/Spring/Spring.Data/Data/Support/ConnectionUtils.cs +++ b/src/Spring/Spring.Data/Data/Support/ConnectionUtils.cs @@ -33,7 +33,7 @@ namespace Spring.Data.Support { #region Logging - private static readonly ILog LOG = LogManager.GetLogger(typeof(ConnectionUtils)); + private static readonly ILogger LOG = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Data/Data/Support/ErrorCodeExceptionTranslator.cs b/src/Spring/Spring.Data/Data/Support/ErrorCodeExceptionTranslator.cs index 36f850a2..ec0599ff 100644 --- a/src/Spring/Spring.Data/Data/Support/ErrorCodeExceptionTranslator.cs +++ b/src/Spring/Spring.Data/Data/Support/ErrorCodeExceptionTranslator.cs @@ -50,8 +50,7 @@ namespace Spring.Data.Support /// /// The shared log instance for this class (and derived classes). /// - protected static readonly ILog log = - LogManager.GetLogger(typeof (ErrorCodeExceptionTranslator)); + protected static readonly ILogger log = LogManager.GetLogger(typeof (ErrorCodeExceptionTranslator)); #endregion diff --git a/src/Spring/Spring.Data/Data/Support/ParameterUtils.cs b/src/Spring/Spring.Data/Data/Support/ParameterUtils.cs index 223e1f7c..1fc74438 100644 --- a/src/Spring/Spring.Data/Data/Support/ParameterUtils.cs +++ b/src/Spring/Spring.Data/Data/Support/ParameterUtils.cs @@ -20,6 +20,7 @@ using System.Collections; using System.Data; +using Microsoft.Extensions.Logging; using Spring.Data.Common; namespace Spring.Data.Support @@ -39,8 +40,7 @@ namespace Spring.Data.Support /// /// The shared log instance for this class (and derived classes). /// - protected static readonly ILog log = - LogManager.GetLogger(typeof (ParameterUtils)); + protected static readonly ILogger log = LogManager.GetLogger(typeof (ParameterUtils)); #endregion diff --git a/src/Spring/Spring.Data/Data/Support/TypedDataSetUtils.cs b/src/Spring/Spring.Data/Data/Support/TypedDataSetUtils.cs index a9a5082d..b20e8935 100644 --- a/src/Spring/Spring.Data/Data/Support/TypedDataSetUtils.cs +++ b/src/Spring/Spring.Data/Data/Support/TypedDataSetUtils.cs @@ -63,8 +63,7 @@ namespace Spring.Data.Support /// public abstract class TypedDataSetUtils { - private static readonly ILog LOG = LogManager.GetLogger(typeof (TypedDataSetUtils)); - + private static readonly ILogger LOG = LogManager.GetLogger(typeof (TypedDataSetUtils)); /// /// Applies the connection and tx to the provided typed dataset. The connection and transaction diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/MethodMapTransactionAttributeSource.cs b/src/Spring/Spring.Data/Transaction/Interceptor/MethodMapTransactionAttributeSource.cs index c24b6847..7bd707fc 100644 --- a/src/Spring/Spring.Data/Transaction/Interceptor/MethodMapTransactionAttributeSource.cs +++ b/src/Spring/Spring.Data/Transaction/Interceptor/MethodMapTransactionAttributeSource.cs @@ -41,7 +41,7 @@ namespace Spring.Transaction.Interceptor #region Logging Definition - private static readonly ILog LOG = LogManager.GetLogger(typeof (MethodMapTransactionAttributeSource)); + private static readonly ILogger LOG = LogManager.GetLogger(typeof (MethodMapTransactionAttributeSource)); #endregion diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/NameMatchTransactionAttributeSource.cs b/src/Spring/Spring.Data/Transaction/Interceptor/NameMatchTransactionAttributeSource.cs index 169075cd..4d043475 100644 --- a/src/Spring/Spring.Data/Transaction/Interceptor/NameMatchTransactionAttributeSource.cs +++ b/src/Spring/Spring.Data/Transaction/Interceptor/NameMatchTransactionAttributeSource.cs @@ -39,7 +39,7 @@ namespace Spring.Transaction.Interceptor /// Logger available to subclasses, static for optimal serialization /// [NonSerialized()] - protected static readonly ILog log = LogManager.GetLogger(typeof(NameMatchTransactionAttributeSource)); + protected static readonly ILogger log = LogManager.GetLogger(); /// /// Keys are method names; values are ITransactionAttributes diff --git a/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAspectSupport.cs b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAspectSupport.cs index 4e0a91b4..eee81fcd 100644 --- a/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAspectSupport.cs +++ b/src/Spring/Spring.Data/Transaction/Interceptor/TransactionAspectSupport.cs @@ -160,7 +160,7 @@ namespace Spring.Transaction.Interceptor #region Logging Definition [NonSerialized] - protected ILog log = LogManager.GetLogger(typeof (TransactionAspectSupport)); + protected ILogger log = LogManager.GetLogger(typeof (TransactionAspectSupport)); #endregion diff --git a/src/Spring/Spring.Data/Transaction/Support/AbstractPlatformTransactionManager.cs b/src/Spring/Spring.Data/Transaction/Support/AbstractPlatformTransactionManager.cs index 3ed86a85..0f0826cd 100644 --- a/src/Spring/Spring.Data/Transaction/Support/AbstractPlatformTransactionManager.cs +++ b/src/Spring/Spring.Data/Transaction/Support/AbstractPlatformTransactionManager.cs @@ -129,7 +129,7 @@ namespace Spring.Transaction.Support #region Logging Definition [NonSerialized()] - protected readonly ILog log; + protected readonly ILogger log; #endregion diff --git a/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationManager.cs b/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationManager.cs index 4e667e93..acf37a65 100644 --- a/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationManager.cs +++ b/src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationManager.cs @@ -67,7 +67,7 @@ namespace Spring.Transaction.Support { #region Logging - private static readonly ILog LOG = LogManager.GetLogger(typeof (TransactionSynchronizationManager)); + private static readonly ILogger LOG = LogManager.GetLogger(typeof (TransactionSynchronizationManager)); #endregion diff --git a/src/Spring/Spring.Data/Transaction/Support/TransactionTemplate.cs b/src/Spring/Spring.Data/Transaction/Support/TransactionTemplate.cs index 5579f18f..555a800d 100644 --- a/src/Spring/Spring.Data/Transaction/Support/TransactionTemplate.cs +++ b/src/Spring/Spring.Data/Transaction/Support/TransactionTemplate.cs @@ -60,7 +60,7 @@ namespace Spring.Transaction.Support #region Logging Definition - protected readonly ILog log = LogManager.GetLogger(typeof(TransactionTemplate)); + protected readonly ILogger log = LogManager.GetLogger(); #endregion /// diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsConnection.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsConnection.cs index c381700f..64806c61 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsConnection.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsConnection.cs @@ -29,7 +29,7 @@ namespace Spring.Messaging.Ems.Common { #region Logging - private readonly ILog logger = LogManager.GetLogger(typeof(EmsConnection)); + private readonly ILogger logger = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/CachedSession.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/CachedSession.cs index 4362e1cf..85052aaf 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/CachedSession.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/CachedSession.cs @@ -39,7 +39,7 @@ namespace Spring.Messaging.Ems.Connections { #region Logging Definition - private static readonly ILog LOG = LogManager.GetLogger(typeof(CachedSession)); + private static readonly ILogger LOG = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/ConnectionFactoryUtils.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/ConnectionFactoryUtils.cs index bc4b70b2..3a52e86f 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/ConnectionFactoryUtils.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/ConnectionFactoryUtils.cs @@ -35,7 +35,7 @@ namespace Spring.Messaging.Ems.Connections { #region Logging - private static readonly ILog LOG = LogManager.GetLogger(typeof(ConnectionFactoryUtils)); + private static readonly ILogger LOG = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/EmsResourceHolder.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/EmsResourceHolder.cs index be52af82..325b22e1 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/EmsResourceHolder.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/EmsResourceHolder.cs @@ -40,7 +40,7 @@ namespace Spring.Messaging.Ems.Connections { #region Logging - private static readonly ILog logger = LogManager.GetLogger(typeof(EmsResourceHolder)); + private static readonly ILogger logger = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/EmsTransactionManager.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/EmsTransactionManager.cs index 9f3b1645..3999cd6c 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/EmsTransactionManager.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/EmsTransactionManager.cs @@ -55,7 +55,7 @@ namespace Spring.Messaging.Ems.Connections #region Logging Definition - private static readonly ILog LOG = LogManager.GetLogger(typeof(EmsTransactionManager)); + private static readonly ILogger LOG = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/EmsGatewaySupport.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/EmsGatewaySupport.cs index c535dd6b..3c533632 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/EmsGatewaySupport.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/EmsGatewaySupport.cs @@ -38,7 +38,7 @@ namespace Spring.Messaging.Ems.Core #region Logging - private readonly ILog logger = LogManager.GetLogger(typeof(EmsGatewaySupport)); + private readonly ILogger logger = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/EmsTemplate.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/EmsTemplate.cs index 056c053e..52efcc3d 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/EmsTemplate.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/EmsTemplate.cs @@ -51,7 +51,7 @@ namespace Spring.Messaging.Ems.Core { #region Logging - private readonly ILog logger = LogManager.GetLogger(typeof(EmsTemplate)); + private readonly ILogger logger = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/AbstractListenerContainer.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/AbstractListenerContainer.cs index 22a5c782..fca04159 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/AbstractListenerContainer.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/AbstractListenerContainer.cs @@ -48,7 +48,7 @@ namespace Spring.Messaging.Ems.Listener { #region Logging - private readonly ILog logger = LogManager.GetLogger(typeof(AbstractListenerContainer)); + private readonly ILogger logger = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/AbstractMessageListenerContainer.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/AbstractMessageListenerContainer.cs index 9cb8e85f..da87b9fd 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/AbstractMessageListenerContainer.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/AbstractMessageListenerContainer.cs @@ -35,7 +35,7 @@ namespace Spring.Messaging.Ems.Listener { #region Logging - private readonly ILog logger = LogManager.GetLogger(typeof(AbstractMessageListenerContainer)); + private readonly ILogger logger = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/SimpleMessageListenerContainer.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/SimpleMessageListenerContainer.cs index 89639473..749f0d74 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/SimpleMessageListenerContainer.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/SimpleMessageListenerContainer.cs @@ -38,7 +38,7 @@ namespace Spring.Messaging.Ems.Listener { #region Logging - private readonly ILog logger = LogManager.GetLogger(typeof(SimpleMessageListenerContainer)); + private readonly ILogger logger = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/EmsAccessor.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/EmsAccessor.cs index 52434afc..3a24ddf0 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/EmsAccessor.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/EmsAccessor.cs @@ -36,7 +36,7 @@ namespace Spring.Messaging.Ems.Support { #region Logging - private readonly ILog logger = LogManager.GetLogger(typeof(EmsAccessor)); + private readonly ILogger logger = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/EmsUtils.cs b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/EmsUtils.cs index 907c3c83..1d8a80b8 100644 --- a/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/EmsUtils.cs +++ b/src/Spring/Spring.Messaging.Ems/Messaging/Ems/Support/EmsUtils.cs @@ -32,7 +32,7 @@ namespace Spring.Messaging.Ems.Support { #region Logging - private static readonly ILog logger = LogManager.GetLogger(typeof(EmsUtils)); + private static readonly ILogger logger = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachedSession.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachedSession.cs index 0a40b2d0..0853e1a1 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachedSession.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachedSession.cs @@ -32,7 +32,7 @@ namespace Spring.Messaging.Nms.Connections /// Mark Pollack public class CachedSession : IDecoratorSession { - private static readonly ILog Log = LogManager.GetLogger(typeof(CachedSession)); + private static readonly ILogger Log = LogManager.GetLogger(); private readonly ISession target; private readonly List sessionList; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachingConnectionFactory.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachingConnectionFactory.cs index c318ffb2..c717b245 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachingConnectionFactory.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/CachingConnectionFactory.cs @@ -52,7 +52,7 @@ namespace Spring.Messaging.Nms.Connections /// Mark Pollack (.NET) public class CachingConnectionFactory : SingleConnectionFactory { - private static readonly ILog Log = LogManager.GetLogger(typeof(CachingConnectionFactory)); + private static readonly ILogger Log = LogManager.GetLogger(); private int sessionCacheSize = 1; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ConnectionFactoryUtils.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ConnectionFactoryUtils.cs index e6c2692b..1463e0bf 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ConnectionFactoryUtils.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/ConnectionFactoryUtils.cs @@ -35,7 +35,7 @@ namespace Spring.Messaging.Nms.Connections { #region Logging - private static readonly ILog LOG = LogManager.GetLogger(typeof(ConnectionFactoryUtils)); + private static readonly ILogger LOG = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsResourceHolder.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsResourceHolder.cs index e6d82051..f93c91c7 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsResourceHolder.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsResourceHolder.cs @@ -33,7 +33,7 @@ namespace Spring.Messaging.Nms.Connections /// Mark Pollack (.NET) public class NmsResourceHolder : ResourceHolderSupport { - private static readonly ILog logger = LogManager.GetLogger(typeof(NmsResourceHolder)); + private static readonly ILogger logger = LogManager.GetLogger(); private readonly IConnectionFactory connectionFactory; private readonly bool frozen = false; diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsTransactionManager.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsTransactionManager.cs index 927c8637..a6306c8e 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsTransactionManager.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/NmsTransactionManager.cs @@ -72,7 +72,7 @@ namespace Spring.Messaging.Nms.Connections #region Logging Definition - private static readonly ILog LOG = LogManager.GetLogger(typeof(NmsTransactionManager)); + private static readonly ILogger LOG = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SingleConnectionFactory.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SingleConnectionFactory.cs index 99795c76..62b16588 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SingleConnectionFactory.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SingleConnectionFactory.cs @@ -59,7 +59,7 @@ namespace Spring.Messaging.Nms.Connections { #region Logging Definition - private static readonly ILog LOG = LogManager.GetLogger(typeof(SingleConnectionFactory)); + private static readonly ILogger LOG = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsGatewaySupport.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsGatewaySupport.cs index 0efe7285..2dcee77d 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsGatewaySupport.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsGatewaySupport.cs @@ -20,6 +20,7 @@ using Spring.Objects.Factory; using Apache.NMS; +using Microsoft.Extensions.Logging; namespace Spring.Messaging.Nms.Core { @@ -37,7 +38,7 @@ namespace Spring.Messaging.Nms.Core #region Logging - private readonly ILog logger = LogManager.GetLogger(typeof(NmsGatewaySupport)); + private readonly ILogger logger = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTemplate.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTemplate.cs index aed516a5..ed2d0ff4 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTemplate.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTemplate.cs @@ -50,7 +50,7 @@ namespace Spring.Messaging.Nms.Core { #region Logging - private readonly ILog logger = LogManager.GetLogger(typeof(NmsTemplate)); + private readonly ILogger logger = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTemplateAsync.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTemplateAsync.cs index d76c7937..9e4eb3ef 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTemplateAsync.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTemplateAsync.cs @@ -35,7 +35,7 @@ namespace Spring.Messaging.Nms.Core { #region Logging - private readonly ILog logger = LogManager.GetLogger(typeof(NmsTemplate)); + private readonly ILogger logger = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTrace.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTrace.cs index 7a07ccaa..8d7ad9b2 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTrace.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Core/NmsTrace.cs @@ -34,7 +34,7 @@ namespace Spring.Messaging.Nms.Core { #region Logging Definition - private readonly ILog log; + private readonly ILogger log; #endregion @@ -51,7 +51,7 @@ namespace Spring.Messaging.Nms.Core /// Initializes a new instance of the class. /// /// The log instance to use for logging. - public NmsTrace(ILog log) + public NmsTrace(ILogger log) { this.log = log; } diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractListenerContainer.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractListenerContainer.cs index 80c3c9e8..ce15f5fd 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractListenerContainer.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractListenerContainer.cs @@ -48,7 +48,7 @@ namespace Spring.Messaging.Nms.Listener { #region Logging - private readonly ILog logger = LogManager.GetLogger(typeof(AbstractListenerContainer)); + private readonly ILogger logger = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractMessageListenerContainer.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractMessageListenerContainer.cs index 4a71438b..484622c4 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractMessageListenerContainer.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/AbstractMessageListenerContainer.cs @@ -35,7 +35,7 @@ namespace Spring.Messaging.Nms.Listener { #region Logging - private readonly ILog logger = LogManager.GetLogger(typeof(AbstractMessageListenerContainer)); + private readonly ILogger logger = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/Adapter/MessageListenerAdapter.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/Adapter/MessageListenerAdapter.cs index d33f4f73..bdd2d33b 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/Adapter/MessageListenerAdapter.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/Adapter/MessageListenerAdapter.cs @@ -68,7 +68,7 @@ namespace Spring.Messaging.Nms.Listener.Adapter { #region Logging - private readonly ILog logger = LogManager.GetLogger(typeof (MessageListenerAdapter)); + private readonly ILogger logger = LogManager.GetLogger(typeof (MessageListenerAdapter)); #endregion diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/SimpleMessageListenerContainer.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/SimpleMessageListenerContainer.cs index 71042d84..8b4196c1 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/SimpleMessageListenerContainer.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/SimpleMessageListenerContainer.cs @@ -38,7 +38,7 @@ namespace Spring.Messaging.Nms.Listener { #region Logging - private readonly ILog logger = LogManager.GetLogger(typeof(SimpleMessageListenerContainer)); + private readonly ILogger logger = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/MessageUtils.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/MessageUtils.cs index f52faf5e..040f934e 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/MessageUtils.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/MessageUtils.cs @@ -32,7 +32,7 @@ namespace Spring.Messaging.Nms.Support { #region Logging - private static readonly ILog logger = LogManager.GetLogger(typeof(NmsUtils)); + private static readonly ILogger logger = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/MessageUtilsAsync.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/MessageUtilsAsync.cs index 301f8d89..21c4cbe9 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/MessageUtilsAsync.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/MessageUtilsAsync.cs @@ -30,7 +30,7 @@ namespace Spring.Messaging.Nms.Support { #region Logging - private static readonly ILog logger = LogManager.GetLogger(typeof(NmsUtils)); + private static readonly ILogger logger = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsAccessor.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsAccessor.cs index 055a4063..944c4e49 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsAccessor.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsAccessor.cs @@ -38,7 +38,7 @@ namespace Spring.Messaging.Nms.Support { #region Logging - private readonly ILog logger = LogManager.GetLogger(typeof(NmsAccessor)); + private readonly ILogger logger = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsAccessorAsync.cs b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsAccessorAsync.cs index 71d0f1aa..82a2dd25 100644 --- a/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsAccessorAsync.cs +++ b/src/Spring/Spring.Messaging.Nms/Messaging/Nms/Support/NmsAccessorAsync.cs @@ -31,7 +31,7 @@ namespace Spring.Messaging.Nms.Support { #region Logging - private readonly ILog logger = LogManager.GetLogger(typeof(NmsAccessor)); + private readonly ILogger logger = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Messaging/Messaging/Core/DefaultMessageQueueFactory.cs b/src/Spring/Spring.Messaging/Messaging/Core/DefaultMessageQueueFactory.cs index e1110b8e..4fe1829d 100644 --- a/src/Spring/Spring.Messaging/Messaging/Core/DefaultMessageQueueFactory.cs +++ b/src/Spring/Spring.Messaging/Messaging/Core/DefaultMessageQueueFactory.cs @@ -43,9 +43,9 @@ namespace Spring.Messaging.Core public class DefaultMessageQueueFactory : IMessageQueueFactory, IApplicationContextAware { /// - /// The instance for this class. + /// The instance for this class. /// - private readonly ILog log = LogManager.GetLogger(typeof(DefaultMessageQueueFactory)); + private readonly ILogger log = LogManager.GetLogger(); private static readonly string QUEUE_DICTIONARY_SLOTNAME = diff --git a/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueMetadataCache.cs b/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueMetadataCache.cs index eaa52780..788ea956 100644 --- a/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueMetadataCache.cs +++ b/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueMetadataCache.cs @@ -13,7 +13,7 @@ namespace Spring.Messaging.Core { #region Logging Definition - private static readonly ILog LOG = LogManager.GetLogger(typeof(MessageQueueMetadataCache)); + private static readonly ILogger LOG = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueTemplate.cs b/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueTemplate.cs index 7db03afd..5d9d4b59 100644 --- a/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueTemplate.cs +++ b/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueTemplate.cs @@ -76,7 +76,7 @@ namespace Spring.Messaging.Core { #region Logging Definition - private static readonly ILog LOG = LogManager.GetLogger(typeof (MessageQueueTemplate)); + private static readonly ILogger LOG = LogManager.GetLogger(typeof (MessageQueueTemplate)); #endregion diff --git a/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueTransactionManager.cs b/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueTransactionManager.cs index 70125104..8d5469d6 100644 --- a/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueTransactionManager.cs +++ b/src/Spring/Spring.Messaging/Messaging/Core/MessageQueueTransactionManager.cs @@ -60,7 +60,7 @@ namespace Spring.Messaging.Core #region Logging Definition - private static readonly ILog LOG = LogManager.GetLogger(typeof (MessageQueueTransactionManager)); + private static readonly ILogger LOG = LogManager.GetLogger(typeof (MessageQueueTransactionManager)); #endregion diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/AbstractListenerContainer.cs b/src/Spring/Spring.Messaging/Messaging/Listener/AbstractListenerContainer.cs index 075a0bb0..c78ca491 100644 --- a/src/Spring/Spring.Messaging/Messaging/Listener/AbstractListenerContainer.cs +++ b/src/Spring/Spring.Messaging/Messaging/Listener/AbstractListenerContainer.cs @@ -43,7 +43,7 @@ namespace Spring.Messaging.Listener { #region Logging Definition - private static readonly ILog LOG = LogManager.GetLogger(typeof (AbstractListenerContainer)); + private static readonly ILogger LOG = LogManager.GetLogger(typeof (AbstractListenerContainer)); #endregion diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/AbstractMessageListenerContainer.cs b/src/Spring/Spring.Messaging/Messaging/Listener/AbstractMessageListenerContainer.cs index e47fd24f..5aca4769 100644 --- a/src/Spring/Spring.Messaging/Messaging/Listener/AbstractMessageListenerContainer.cs +++ b/src/Spring/Spring.Messaging/Messaging/Listener/AbstractMessageListenerContainer.cs @@ -44,7 +44,7 @@ namespace Spring.Messaging.Listener { #region Logging Definition - private static readonly ILog LOG = LogManager.GetLogger(typeof (AbstractMessageListenerContainer)); + private static readonly ILogger LOG = LogManager.GetLogger(typeof (AbstractMessageListenerContainer)); #endregion diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/AbstractPeekingMessageListenerContainer.cs b/src/Spring/Spring.Messaging/Messaging/Listener/AbstractPeekingMessageListenerContainer.cs index 925e4e56..dddb607f 100644 --- a/src/Spring/Spring.Messaging/Messaging/Listener/AbstractPeekingMessageListenerContainer.cs +++ b/src/Spring/Spring.Messaging/Messaging/Listener/AbstractPeekingMessageListenerContainer.cs @@ -54,7 +54,7 @@ namespace Spring.Messaging.Listener { #region Logging Definition - private static readonly ILog LOG = LogManager.GetLogger(typeof (AbstractPeekingMessageListenerContainer)); + private static readonly ILogger LOG = LogManager.GetLogger(typeof (AbstractPeekingMessageListenerContainer)); #endregion diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/AbstractTransactionalMessageListenerContainer.cs b/src/Spring/Spring.Messaging/Messaging/Listener/AbstractTransactionalMessageListenerContainer.cs index 4bee73d7..1056a210 100644 --- a/src/Spring/Spring.Messaging/Messaging/Listener/AbstractTransactionalMessageListenerContainer.cs +++ b/src/Spring/Spring.Messaging/Messaging/Listener/AbstractTransactionalMessageListenerContainer.cs @@ -52,7 +52,7 @@ namespace Spring.Messaging.Listener { #region Logging Definition - private static readonly ILog LOG = LogManager.GetLogger(typeof (AbstractTransactionalMessageListenerContainer)); + private static readonly ILogger LOG = LogManager.GetLogger(typeof (AbstractTransactionalMessageListenerContainer)); #endregion diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/DistributedTxMessageListenerContainer.cs b/src/Spring/Spring.Messaging/Messaging/Listener/DistributedTxMessageListenerContainer.cs index c709cf08..2a4a2700 100644 --- a/src/Spring/Spring.Messaging/Messaging/Listener/DistributedTxMessageListenerContainer.cs +++ b/src/Spring/Spring.Messaging/Messaging/Listener/DistributedTxMessageListenerContainer.cs @@ -55,7 +55,7 @@ namespace Spring.Messaging.Listener { #region Logging Definition - private static readonly ILog LOG = LogManager.GetLogger(typeof (DistributedTxMessageListenerContainer)); + private static readonly ILogger LOG = LogManager.GetLogger(typeof (DistributedTxMessageListenerContainer)); #endregion diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/MessageListenerAdapter.cs b/src/Spring/Spring.Messaging/Messaging/Listener/MessageListenerAdapter.cs index a7a133c4..58fea742 100644 --- a/src/Spring/Spring.Messaging/Messaging/Listener/MessageListenerAdapter.cs +++ b/src/Spring/Spring.Messaging/Messaging/Listener/MessageListenerAdapter.cs @@ -115,7 +115,7 @@ namespace Spring.Messaging.Listener { #region Logging - private static readonly ILog logger = LogManager.GetLogger(typeof (MessageListenerAdapter)); + private static readonly ILogger logger = LogManager.GetLogger(typeof (MessageListenerAdapter)); #endregion diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/NonTransactionalMessageListenerContainer.cs b/src/Spring/Spring.Messaging/Messaging/Listener/NonTransactionalMessageListenerContainer.cs index 7e97e189..dbf069b6 100644 --- a/src/Spring/Spring.Messaging/Messaging/Listener/NonTransactionalMessageListenerContainer.cs +++ b/src/Spring/Spring.Messaging/Messaging/Listener/NonTransactionalMessageListenerContainer.cs @@ -41,7 +41,7 @@ namespace Spring.Messaging.Listener { #region Logging Definition - private static readonly ILog LOG = LogManager.GetLogger(typeof (NonTransactionalMessageListenerContainer)); + private static readonly ILogger LOG = LogManager.GetLogger(typeof (NonTransactionalMessageListenerContainer)); #endregion diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/SendToQueueDistributedTransactionExceptionHandler.cs b/src/Spring/Spring.Messaging/Messaging/Listener/SendToQueueDistributedTransactionExceptionHandler.cs index d0b09c06..686c559c 100644 --- a/src/Spring/Spring.Messaging/Messaging/Listener/SendToQueueDistributedTransactionExceptionHandler.cs +++ b/src/Spring/Spring.Messaging/Messaging/Listener/SendToQueueDistributedTransactionExceptionHandler.cs @@ -40,8 +40,7 @@ namespace Spring.Messaging.Listener { #region Logging Definition - private static readonly ILog LOG = - LogManager.GetLogger(typeof (SendToQueueDistributedTransactionExceptionHandler)); + private static readonly ILogger LOG = LogManager.GetLogger(typeof (SendToQueueDistributedTransactionExceptionHandler)); #endregion diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/SendToQueueExceptionHandler.cs b/src/Spring/Spring.Messaging/Messaging/Listener/SendToQueueExceptionHandler.cs index 94eae251..6dbea674 100644 --- a/src/Spring/Spring.Messaging/Messaging/Listener/SendToQueueExceptionHandler.cs +++ b/src/Spring/Spring.Messaging/Messaging/Listener/SendToQueueExceptionHandler.cs @@ -38,7 +38,7 @@ namespace Spring.Messaging.Listener { #region Logging Definition - private static readonly ILog LOG = LogManager.GetLogger(typeof (SendToQueueExceptionHandler)); + private static readonly ILogger LOG = LogManager.GetLogger(typeof (SendToQueueExceptionHandler)); #endregion diff --git a/src/Spring/Spring.Messaging/Messaging/Listener/TransactionalMessageListenerContainer.cs b/src/Spring/Spring.Messaging/Messaging/Listener/TransactionalMessageListenerContainer.cs index a77de83c..4e239e2f 100644 --- a/src/Spring/Spring.Messaging/Messaging/Listener/TransactionalMessageListenerContainer.cs +++ b/src/Spring/Spring.Messaging/Messaging/Listener/TransactionalMessageListenerContainer.cs @@ -116,7 +116,7 @@ namespace Spring.Messaging.Listener { #region Logging Definition - private static readonly ILog LOG = LogManager.GetLogger(typeof (TransactionalMessageListenerContainer)); + private static readonly ILogger LOG = LogManager.GetLogger(typeof (TransactionalMessageListenerContainer)); #endregion diff --git a/src/Spring/Spring.Scheduling.Quartz3/Scheduling/Quartz/LocalTaskExecutorThreadPool.cs b/src/Spring/Spring.Scheduling.Quartz3/Scheduling/Quartz/LocalTaskExecutorThreadPool.cs index 5d747d3b..bc65c99c 100644 --- a/src/Spring/Spring.Scheduling.Quartz3/Scheduling/Quartz/LocalTaskExecutorThreadPool.cs +++ b/src/Spring/Spring.Scheduling.Quartz3/Scheduling/Quartz/LocalTaskExecutorThreadPool.cs @@ -41,7 +41,7 @@ namespace Spring.Scheduling.Quartz /// /// Logger instance. /// - protected ILog Logger { get; } + protected ILogger Logger { get; } /// public virtual int PoolSize => -1; diff --git a/src/Spring/Spring.Scheduling.Quartz3/Scheduling/Quartz/MethodInvokingJob.cs b/src/Spring/Spring.Scheduling.Quartz3/Scheduling/Quartz/MethodInvokingJob.cs index 505d55ed..f0124d7c 100644 --- a/src/Spring/Spring.Scheduling.Quartz3/Scheduling/Quartz/MethodInvokingJob.cs +++ b/src/Spring/Spring.Scheduling.Quartz3/Scheduling/Quartz/MethodInvokingJob.cs @@ -27,7 +27,7 @@ namespace Spring.Scheduling.Quartz /// public class MethodInvokingJob : QuartzJobObject { - private static readonly ILog logger = LogManager.GetLogger(typeof(MethodInvokingJob)); + private static readonly ILogger logger = LogManager.GetLogger(); private MethodInvoker methodInvoker; private string errorMessage; diff --git a/src/Spring/Spring.Scheduling.Quartz3/Scheduling/Quartz/MethodInvokingRunnable.cs b/src/Spring/Spring.Scheduling.Quartz3/Scheduling/Quartz/MethodInvokingRunnable.cs index 2b20be6e..0f46f07c 100644 --- a/src/Spring/Spring.Scheduling.Quartz3/Scheduling/Quartz/MethodInvokingRunnable.cs +++ b/src/Spring/Spring.Scheduling.Quartz3/Scheduling/Quartz/MethodInvokingRunnable.cs @@ -39,7 +39,7 @@ namespace Spring.Scheduling.Quartz /// /// Logger instance shared by this instance and its sub-class instances. /// - private readonly ILog logger; + private readonly ILogger logger; /// /// Initializes a new instance of the class. @@ -52,7 +52,7 @@ namespace Spring.Scheduling.Quartz /// /// Logger instance. /// - protected ILog Logger => logger; + protected ILogger Logger => logger; /// /// Gets the invocation failure message. diff --git a/src/Spring/Spring.Scheduling.Quartz3/Scheduling/Quartz/SchedulerAccessor.cs b/src/Spring/Spring.Scheduling.Quartz3/Scheduling/Quartz/SchedulerAccessor.cs index fc476ed0..12d89ecf 100644 --- a/src/Spring/Spring.Scheduling.Quartz3/Scheduling/Quartz/SchedulerAccessor.cs +++ b/src/Spring/Spring.Scheduling.Quartz3/Scheduling/Quartz/SchedulerAccessor.cs @@ -41,7 +41,7 @@ namespace Spring.Scheduling.Quartz /// /// Logger instance. /// - private readonly ILog logger; + private readonly ILogger logger; private bool overwriteExistingJobs; @@ -237,7 +237,7 @@ namespace Spring.Scheduling.Quartz /// /// Logger instance. /// - protected ILog Logger => logger; + protected ILogger Logger => logger; /// /// Register jobs and triggers (within a transaction, if possible). diff --git a/src/Spring/Spring.Services/Remoting/CaoExporter.cs b/src/Spring/Spring.Services/Remoting/CaoExporter.cs index 70ee6037..f9371b72 100644 --- a/src/Spring/Spring.Services/Remoting/CaoExporter.cs +++ b/src/Spring/Spring.Services/Remoting/CaoExporter.cs @@ -38,7 +38,7 @@ namespace Spring.Remoting { #region Logging - private static readonly ILog LOG = LogManager.GetLogger(typeof(CaoExporter)); + private static readonly ILogger LOG = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Services/Remoting/CaoFactoryObject.cs b/src/Spring/Spring.Services/Remoting/CaoFactoryObject.cs index 384cb8db..ea7b1840 100644 --- a/src/Spring/Spring.Services/Remoting/CaoFactoryObject.cs +++ b/src/Spring/Spring.Services/Remoting/CaoFactoryObject.cs @@ -35,7 +35,7 @@ namespace Spring.Remoting { #region Logging - private static readonly ILog LOG = LogManager.GetLogger(typeof(CaoFactoryObject)); + private static readonly ILogger LOG = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Services/Remoting/RemotingConfigurer.cs b/src/Spring/Spring.Services/Remoting/RemotingConfigurer.cs index 47328394..02d5acea 100644 --- a/src/Spring/Spring.Services/Remoting/RemotingConfigurer.cs +++ b/src/Spring/Spring.Services/Remoting/RemotingConfigurer.cs @@ -34,7 +34,7 @@ namespace Spring.Remoting { #region Fields - private static readonly ILog log = LogManager.GetLogger(typeof(RemotingConfigurer)); + private static readonly ILogger log = LogManager.GetLogger(); private int _order = Int32.MinValue; diff --git a/src/Spring/Spring.Services/Remoting/SaoExporter.cs b/src/Spring/Spring.Services/Remoting/SaoExporter.cs index 6d9ad8c0..ac245d81 100644 --- a/src/Spring/Spring.Services/Remoting/SaoExporter.cs +++ b/src/Spring/Spring.Services/Remoting/SaoExporter.cs @@ -48,7 +48,7 @@ namespace Spring.Remoting { #region Logging - private static readonly ILog LOG = LogManager.GetLogger( typeof( SaoExporter ) ); + private static readonly ILogger LOG = LogManager.GetLogger( typeof( SaoExporter ) ); #endregion diff --git a/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactoryObject.cs b/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactoryObject.cs index 47a10fce..2ae2d95c 100644 --- a/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactoryObject.cs +++ b/src/Spring/Spring.Services/ServiceModel/Activation/ServiceHostFactoryObject.cs @@ -33,7 +33,7 @@ namespace Spring.ServiceModel.Activation { #region Logging - private static readonly ILog LOG = LogManager.GetLogger(typeof(ServiceHostFactoryObject)); + private static readonly ILogger LOG = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Services/ServiceModel/ChannelFactoryObject.cs b/src/Spring/Spring.Services/ServiceModel/ChannelFactoryObject.cs index 6ca32ae0..365e79a7 100644 --- a/src/Spring/Spring.Services/ServiceModel/ChannelFactoryObject.cs +++ b/src/Spring/Spring.Services/ServiceModel/ChannelFactoryObject.cs @@ -34,7 +34,7 @@ namespace Spring.ServiceModel { #region Logging - private static readonly ILog Log = LogManager.GetLogger(typeof(ChannelFactoryObject<>)); + private static readonly ILogger Log = LogManager.GetLogger(typeof(ChannelFactoryObject<>)); #endregion diff --git a/src/Spring/Spring.Services/ServiceModel/ServiceExporter.cs b/src/Spring/Spring.Services/ServiceModel/ServiceExporter.cs index b0641dab..5f98ff85 100644 --- a/src/Spring/Spring.Services/ServiceModel/ServiceExporter.cs +++ b/src/Spring/Spring.Services/ServiceModel/ServiceExporter.cs @@ -41,7 +41,7 @@ namespace Spring.ServiceModel { #region Logging - //private static readonly ILog LOG = LogManager.GetLogger(typeof(ServiceExporter)); + //private static readonly ILogger LOG = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Services/Web/Services/WebServiceProxyFactory.cs b/src/Spring/Spring.Services/Web/Services/WebServiceProxyFactory.cs index c0f012dd..9c674e7e 100644 --- a/src/Spring/Spring.Services/Web/Services/WebServiceProxyFactory.cs +++ b/src/Spring/Spring.Services/Web/Services/WebServiceProxyFactory.cs @@ -56,7 +56,7 @@ namespace Spring.Web.Services { #region Logging - private static readonly ILog LOG = LogManager.GetLogger(typeof(WebServiceProxyFactory)); + private static readonly ILogger LOG = LogManager.GetLogger(); #endregion @@ -429,7 +429,7 @@ namespace Spring.Web.Services { #region Logging - private static readonly ILog LOG = LogManager.GetLogger(typeof(SoapHttpClientProxyTypeBuilder)); + private static readonly ILogger LOG = LogManager.GetLogger(); #endregion diff --git a/src/Spring/Spring.Template.Velocity.Castle/Template/Velocity/SpringResourceLoader.cs b/src/Spring/Spring.Template.Velocity.Castle/Template/Velocity/SpringResourceLoader.cs index d24369e9..ed8d61c2 100644 --- a/src/Spring/Spring.Template.Velocity.Castle/Template/Velocity/SpringResourceLoader.cs +++ b/src/Spring/Spring.Template.Velocity.Castle/Template/Velocity/SpringResourceLoader.cs @@ -79,7 +79,7 @@ namespace Spring.Template.Velocity /// /// Shared logger instance. /// - protected static readonly ILog log = LogManager.GetLogger(typeof(SpringResourceLoader)); + protected static readonly ILogger log = LogManager.GetLogger(); private IResourceLoader resourceLoader; diff --git a/src/Spring/Spring.Template.Velocity/Template/Velocity/CommonsLoggingLogSystem.cs b/src/Spring/Spring.Template.Velocity/Template/Velocity/CommonsLoggingLogSystem.cs index 64c12319..252c8ca0 100644 --- a/src/Spring/Spring.Template.Velocity/Template/Velocity/CommonsLoggingLogSystem.cs +++ b/src/Spring/Spring.Template.Velocity/Template/Velocity/CommonsLoggingLogSystem.cs @@ -34,7 +34,7 @@ namespace Spring.Template.Velocity /// /// Shared logger instance. /// - protected static readonly ILog log = LogManager.GetLogger(typeof(CommonsLoggingLogSystem)); + protected static readonly ILogger log = LogManager.GetLogger(); /// /// Initializes the specified runtime services. No-op in current implementatin diff --git a/src/Spring/Spring.Template.Velocity/Template/Velocity/SpringResourceLoader.cs b/src/Spring/Spring.Template.Velocity/Template/Velocity/SpringResourceLoader.cs index 5da2ca68..830da70e 100644 --- a/src/Spring/Spring.Template.Velocity/Template/Velocity/SpringResourceLoader.cs +++ b/src/Spring/Spring.Template.Velocity/Template/Velocity/SpringResourceLoader.cs @@ -77,7 +77,7 @@ namespace Spring.Template.Velocity { /// /// Shared logger instance. /// - protected static readonly ILog log = LogManager.GetLogger(typeof(SpringResourceLoader)); + protected static readonly ILogger log = LogManager.GetLogger(); private IResourceLoader resourceLoader; diff --git a/src/Spring/Spring.Template.Velocity/Template/Velocity/VelocityEngineFactory.cs b/src/Spring/Spring.Template.Velocity/Template/Velocity/VelocityEngineFactory.cs index 20dfb291..84fd5cdc 100644 --- a/src/Spring/Spring.Template.Velocity/Template/Velocity/VelocityEngineFactory.cs +++ b/src/Spring/Spring.Template.Velocity/Template/Velocity/VelocityEngineFactory.cs @@ -67,7 +67,7 @@ namespace Spring.Template.Velocity { /// /// Shared logger instance. /// - protected static readonly ILog log = LogManager.GetLogger(typeof(VelocityEngineFactory)); + protected static readonly ILogger log = LogManager.GetLogger(); private IResource configLocation; diff --git a/src/Spring/Spring.Template.Velocity/Template/Velocity/VelocityEngineUtils.cs b/src/Spring/Spring.Template.Velocity/Template/Velocity/VelocityEngineUtils.cs index 454b0687..e3eb233e 100644 --- a/src/Spring/Spring.Template.Velocity/Template/Velocity/VelocityEngineUtils.cs +++ b/src/Spring/Spring.Template.Velocity/Template/Velocity/VelocityEngineUtils.cs @@ -30,12 +30,6 @@ namespace Spring.Template.Velocity{ /// Erez Mazor public class VelocityEngineUtils { - - /// - /// Shared logger instance. - /// - protected static readonly ILog log = LogManager.GetLogger(typeof(VelocityEngineUtils)); - /// /// Merge the specified Velocity template with the given model and write /// the result to the given Writer. diff --git a/src/Spring/Spring.Testing.Microsoft/Testing/Microsoft/AbstractSpringContextTests.cs b/src/Spring/Spring.Testing.Microsoft/Testing/Microsoft/AbstractSpringContextTests.cs index 327e97f6..ada73c83 100644 --- a/src/Spring/Spring.Testing.Microsoft/Testing/Microsoft/AbstractSpringContextTests.cs +++ b/src/Spring/Spring.Testing.Microsoft/Testing/Microsoft/AbstractSpringContextTests.cs @@ -76,7 +76,7 @@ namespace Spring.Testing.Microsoft /// /// Logger available to subclasses. /// - protected readonly ILog logger; + protected readonly ILogger logger; /// /// Default constructor for AbstractSpringContextTests. diff --git a/src/Spring/Spring.Testing.NUnit/Testing/Ado/SimpleAdoTestUtils.cs b/src/Spring/Spring.Testing.NUnit/Testing/Ado/SimpleAdoTestUtils.cs index b37ab38f..d756da8b 100644 --- a/src/Spring/Spring.Testing.NUnit/Testing/Ado/SimpleAdoTestUtils.cs +++ b/src/Spring/Spring.Testing.NUnit/Testing/Ado/SimpleAdoTestUtils.cs @@ -38,7 +38,7 @@ namespace Spring.Testing.Ado /// Erich Eichinger public class SimpleAdoTestUtils { - private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + private static readonly ILogger Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly RegexOptions REGEX_OPTIONS = RegexOptions.Multiline | RegexOptions.ECMAScript | RegexOptions.Compiled | RegexOptions.CultureInvariant | RegexOptions.IgnoreCase; /// diff --git a/src/Spring/Spring.Testing.NUnit/Testing/NUnit/AbstractSpringContextTests.cs b/src/Spring/Spring.Testing.NUnit/Testing/NUnit/AbstractSpringContextTests.cs index 684bba64..3b9a31b9 100644 --- a/src/Spring/Spring.Testing.NUnit/Testing/NUnit/AbstractSpringContextTests.cs +++ b/src/Spring/Spring.Testing.NUnit/Testing/NUnit/AbstractSpringContextTests.cs @@ -72,7 +72,7 @@ namespace Spring.Testing.NUnit /// /// Logger available to subclasses. /// - protected readonly ILog logger; + protected readonly ILogger logger; /// /// Default constructor for AbstractSpringContextTests. diff --git a/src/Spring/Spring.Web.Conversation.NHibernate5/Data/NHibernate/Support/SessionPerConversationScope.cs b/src/Spring/Spring.Web.Conversation.NHibernate5/Data/NHibernate/Support/SessionPerConversationScope.cs index 58957945..280ed99f 100644 --- a/src/Spring/Spring.Web.Conversation.NHibernate5/Data/NHibernate/Support/SessionPerConversationScope.cs +++ b/src/Spring/Spring.Web.Conversation.NHibernate5/Data/NHibernate/Support/SessionPerConversationScope.cs @@ -38,7 +38,7 @@ namespace Spring.Data.NHibernate.Support /// /// The logging instance. /// - protected readonly ILog log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + protected readonly ILogger log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private readonly SessionPerConversationScopeSettings settings; @@ -373,7 +373,7 @@ namespace Spring.Data.NHibernate.Support /// private class LazySessionPerConversationHolder : SessionHolder { - private readonly ILog log = LogManager.GetLogger(typeof(LazySessionPerConversationHolder)); + private readonly ILogger log = LogManager.GetLogger(); private SessionPerConversationScope owner; IConversationState activeConversation; diff --git a/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/HttpModule/ConversationModule.cs b/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/HttpModule/ConversationModule.cs index 7b0796e8..d2e8579a 100644 --- a/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/HttpModule/ConversationModule.cs +++ b/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/HttpModule/ConversationModule.cs @@ -31,7 +31,7 @@ namespace Spring.Web.Conversation.HttpModule /// Hailton de Castro public class ConversationModule : IHttpModule, IApplicationContextAware { - private static readonly ILog LOG = LogManager.GetLogger(typeof(ConversationModule)); + private static readonly ILogger LOG = LogManager.GetLogger(); private IList conversationManagerName; diff --git a/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/InnerConversationList.cs b/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/InnerConversationList.cs index c2d6065a..ce4d39a8 100644 --- a/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/InnerConversationList.cs +++ b/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/InnerConversationList.cs @@ -31,7 +31,7 @@ namespace Spring.Web.Conversation [Serializable] public class InnerConversationList: IList, IList { - private static readonly ILog LOG = LogManager.GetLogger(typeof(InnerConversationList)); + private static readonly ILogger LOG = LogManager.GetLogger(); private IConversationState conversationOwner; diff --git a/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/WebConversationManager.cs b/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/WebConversationManager.cs index a90eb921..f6dd8dda 100644 --- a/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/WebConversationManager.cs +++ b/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/WebConversationManager.cs @@ -33,7 +33,7 @@ namespace Spring.Web.Conversation [Serializable] public class WebConversationManager : SessionPerConversationScope, IConversationManager, IApplicationContextAware { - private static readonly ILog LOG = LogManager.GetLogger(typeof(WebConversationManager)); + private static readonly ILogger LOG = LogManager.GetLogger(); /// /// Semaphore to synchronize writes to the dictionary. diff --git a/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/WebConversationSpringState.cs b/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/WebConversationSpringState.cs index 14dfb09b..9790f5d1 100644 --- a/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/WebConversationSpringState.cs +++ b/src/Spring/Spring.Web.Conversation.NHibernate5/Web/Conversation/WebConversationSpringState.cs @@ -38,7 +38,7 @@ namespace Spring.Web.Conversation public class WebConversationSpringState : IConversationState, IObjectNameAware, IApplicationContextAware { private const string SPRING_SESSSION_SCOPE_KEY = "spring.objects"; - private static readonly ILog LOG = LogManager.GetLogger(typeof(WebConversationSpringState)); + private static readonly ILogger LOG = LogManager.GetLogger(); /// /// Default message for "CONVERSATION ALREADY HAS A PARENT" error. diff --git a/src/Spring/Spring.Web.Mvc5/SpringMvcDependencyResolver.cs b/src/Spring/Spring.Web.Mvc5/SpringMvcDependencyResolver.cs index 93f97e65..e613dd68 100644 --- a/src/Spring/Spring.Web.Mvc5/SpringMvcDependencyResolver.cs +++ b/src/Spring/Spring.Web.Mvc5/SpringMvcDependencyResolver.cs @@ -18,7 +18,7 @@ namespace Spring.Web.Mvc /// private IApplicationContext _context; - private static readonly ILog logger = LogManager.GetLogger(typeof(SpringMvcDependencyResolver)); + private static readonly ILogger logger = LogManager.GetLogger(); private readonly ConcurrentBag _nonResolvableTypes = new ConcurrentBag(); private readonly ConcurrentDictionary _resolvedNames = new ConcurrentDictionary(); diff --git a/src/Spring/Spring.Web/Caching/AspNetCache.cs b/src/Spring/Spring.Web/Caching/AspNetCache.cs index caf51f5d..5a7fea65 100644 --- a/src/Spring/Spring.Web/Caching/AspNetCache.cs +++ b/src/Spring/Spring.Web/Caching/AspNetCache.cs @@ -104,7 +104,7 @@ namespace Spring.Caching #region Fields // logger instance for this class - private static readonly ILog Log = LogManager.GetLogger(typeof(AspNetCache)); + private static readonly ILogger Log = LogManager.GetLogger(); // the concrete cache implementation private readonly IRuntimeCache _cache; // the (unique!) name of this particular cache instance. diff --git a/src/Spring/Spring.Web/Context/Support/HttpApplicationConfigurer.cs b/src/Spring/Spring.Web/Context/Support/HttpApplicationConfigurer.cs index 88ef22dd..49992549 100644 --- a/src/Spring/Spring.Web/Context/Support/HttpApplicationConfigurer.cs +++ b/src/Spring/Spring.Web/Context/Support/HttpApplicationConfigurer.cs @@ -22,6 +22,7 @@ using System.Collections; using System.Web; +using Microsoft.Extensions.Logging; using Spring.Objects.Factory.Config; using Spring.Util; @@ -35,7 +36,7 @@ namespace Spring.Context.Support /// Erich Eichinger public class HttpApplicationConfigurer { - private static readonly ILog Log = LogManager.GetLogger(typeof(HttpApplicationConfigurer)); + private static readonly ILogger Log = LogManager.GetLogger(); #region ModuleDefinitionsTable class diff --git a/src/Spring/Spring.Web/Context/Support/WebApplicationContext.cs b/src/Spring/Spring.Web/Context/Support/WebApplicationContext.cs index e95a4449..b2d54c1e 100644 --- a/src/Spring/Spring.Web/Context/Support/WebApplicationContext.cs +++ b/src/Spring/Spring.Web/Context/Support/WebApplicationContext.cs @@ -147,7 +147,7 @@ namespace Spring.Context.Support static WebApplicationContext() { - ILog s_weblog = LogManager.GetLogger(typeof(WebApplicationContext)); + ILogger s_weblog = LogManager.GetLogger(); // register for ContextRegistry.Cleared event - we need to discard our cache in this case ContextRegistry.Cleared += OnContextRegistryCleared; @@ -200,7 +200,7 @@ namespace Spring.Context.Support { lock (s_webContextCache) { - ILog s_weblog = LogManager.GetLogger(typeof(WebApplicationContext)); + ILogger s_weblog = LogManager.GetLogger(); if (s_weblog.IsEnabled(LogLevel.Debug)) { s_weblog.LogDebug("received ContextRegistry.Cleared event - clearing webContextCache"); @@ -246,7 +246,7 @@ namespace Spring.Context.Support contextName = DefaultRootContextName; } - ILog s_weblog = LogManager.GetLogger(typeof(WebApplicationContext)); + ILogger s_weblog = LogManager.GetLogger(); bool isLogDebugEnabled = s_weblog.IsEnabled(LogLevel.Debug); lock (s_webContextCache) diff --git a/src/Spring/Spring.Web/Context/Support/WebContextHandler.cs b/src/Spring/Spring.Web/Context/Support/WebContextHandler.cs index b321e96c..c6c972d0 100644 --- a/src/Spring/Spring.Web/Context/Support/WebContextHandler.cs +++ b/src/Spring/Spring.Web/Context/Support/WebContextHandler.cs @@ -42,7 +42,7 @@ namespace Spring.Context.Support /// Erich Eichinger public class WebContextHandler : ContextHandler { - private static readonly ILog Log = LogManager.GetLogger(typeof(WebContextHandler)); + private static readonly ILogger Log = LogManager.GetLogger(); /// /// Sets default context type to diff --git a/src/Spring/Spring.Web/Context/Support/WebSupportModule.cs b/src/Spring/Spring.Web/Context/Support/WebSupportModule.cs index 6db95db2..35919782 100644 --- a/src/Spring/Spring.Web/Context/Support/WebSupportModule.cs +++ b/src/Spring/Spring.Web/Context/Support/WebSupportModule.cs @@ -66,7 +66,7 @@ namespace Spring.Context.Support } } - private static readonly ILog s_log; + private static readonly ILogger s_log; private static bool s_isInitialized = false; diff --git a/src/Spring/Spring.Web/Objects/Factory/Support/WebObjectUtils.cs b/src/Spring/Spring.Web/Objects/Factory/Support/WebObjectUtils.cs index 0b3661db..8e92eb1c 100644 --- a/src/Spring/Spring.Web/Objects/Factory/Support/WebObjectUtils.cs +++ b/src/Spring/Spring.Web/Objects/Factory/Support/WebObjectUtils.cs @@ -31,7 +31,7 @@ namespace Spring.Objects.Factory.Support /// Aleksandar Seovic public sealed class WebObjectUtils { - private static ILog s_log = LogManager.GetLogger( typeof( WebObjectUtils ) ); + private static ILogger s_log = LogManager.GetLogger( typeof( WebObjectUtils ) ); // CLOVER:OFF diff --git a/src/Spring/Spring.Web/Util/HttpContextSwitch.cs b/src/Spring/Spring.Web/Util/HttpContextSwitch.cs index eadc5506..490023af 100644 --- a/src/Spring/Spring.Web/Util/HttpContextSwitch.cs +++ b/src/Spring/Spring.Web/Util/HttpContextSwitch.cs @@ -21,6 +21,7 @@ #region Imports using System.Web; +using Microsoft.Extensions.Logging; #endregion @@ -47,7 +48,7 @@ namespace Spring.Util public class HttpContextSwitch : IDisposable { private readonly IDisposable rewriteContext; - private static readonly ILog log = LogManager.GetLogger(typeof(HttpContextSwitch)); + private static readonly ILogger log = LogManager.GetLogger(); /// /// Performs an immediate call to diff --git a/src/Spring/Spring.Web/Util/VirtualEnvironment.cs b/src/Spring/Spring.Web/Util/VirtualEnvironment.cs index 78a6eced..eedbd296 100644 --- a/src/Spring/Spring.Web/Util/VirtualEnvironment.cs +++ b/src/Spring/Spring.Web/Util/VirtualEnvironment.cs @@ -230,7 +230,7 @@ namespace Spring.Util #endregion //HttpSessionState Adapter - private static readonly ILog log = LogManager.GetLogger(typeof (HttpRuntimeEnvironment)); + private static readonly ILogger log = LogManager.GetLogger(typeof (HttpRuntimeEnvironment)); private class RewriteContext : IDisposable { diff --git a/src/Spring/Spring.Web/Web/Support/AbstractHandlerFactory.cs b/src/Spring/Spring.Web/Web/Support/AbstractHandlerFactory.cs index 87fc2e68..b82aff88 100644 --- a/src/Spring/Spring.Web/Web/Support/AbstractHandlerFactory.cs +++ b/src/Spring/Spring.Web/Web/Support/AbstractHandlerFactory.cs @@ -136,7 +136,7 @@ namespace Spring.Web.Support /// /// Holds the shared logger for all factories. /// - protected readonly ILog Log; + protected readonly ILogger Log; /// /// Creates a new instance of the @@ -294,7 +294,7 @@ namespace Spring.Web.Support /// protected internal static NamedObjectDefinition FindWebObjectDefinition(string appRelativeVirtualPath, IConfigurableListableObjectFactory objectFactory) { - ILog Log = LogManager.GetLogger(typeof(AbstractHandlerFactory)); + ILogger Log = LogManager.GetLogger(); bool isDebug = Log.IsEnabled(LogLevel.Debug); // lookup definition using app-relative url diff --git a/src/Spring/Spring.Web/Web/Support/ControlInterceptor.cs b/src/Spring/Spring.Web/Web/Support/ControlInterceptor.cs index b738da97..19d64249 100644 --- a/src/Spring/Spring.Web/Web/Support/ControlInterceptor.cs +++ b/src/Spring/Spring.Web/Web/Support/ControlInterceptor.cs @@ -35,7 +35,7 @@ namespace Spring.Web.Support { private class NoOpInterceptionStrategy : IInterceptionStrategy { - private static readonly ILog Log = LogManager.GetLogger( typeof( NoOpInterceptionStrategy ) ); + private static readonly ILogger Log = LogManager.GetLogger( typeof( NoOpInterceptionStrategy ) ); public bool Intercept( IApplicationContext defaultApplicationContext, ControlAccessor ctlAccessor, ControlCollectionAccessor ctlColAccessor ) diff --git a/src/Spring/Spring.Web/Web/Support/HandlerMap.cs b/src/Spring/Spring.Web/Web/Support/HandlerMap.cs index 21e4b87b..b10b4ff9 100644 --- a/src/Spring/Spring.Web/Web/Support/HandlerMap.cs +++ b/src/Spring/Spring.Web/Web/Support/HandlerMap.cs @@ -36,7 +36,7 @@ namespace Spring.Web.Support /// Erich Eichinger public class HandlerMap : IDictionary { - private readonly ILog Log = LogManager.GetLogger(typeof(HandlerMap)); + private readonly ILogger Log = LogManager.GetLogger(); private ArrayList _internalTable = new ArrayList(); diff --git a/src/Spring/Spring.Web/Web/UI/Controls/ContentReplacer.cs b/src/Spring/Spring.Web/Web/UI/Controls/ContentReplacer.cs index d57d9bff..2137324f 100644 --- a/src/Spring/Spring.Web/Web/UI/Controls/ContentReplacer.cs +++ b/src/Spring/Spring.Web/Web/UI/Controls/ContentReplacer.cs @@ -46,7 +46,7 @@ namespace Spring.Web.UI.Controls /// Erich Eichinger public class ContentReplacer : Control { - private static readonly ILog log = LogManager.GetLogger(typeof(ContentReplacer)); + private static readonly ILogger log = LogManager.GetLogger(); private string contentPlaceHolderID; diff --git a/src/Spring/Spring.Web/Web/UI/Controls/DataBindingPanel.cs b/src/Spring/Spring.Web/Web/UI/Controls/DataBindingPanel.cs index 11fe6a68..de1085ba 100644 --- a/src/Spring/Spring.Web/Web/UI/Controls/DataBindingPanel.cs +++ b/src/Spring/Spring.Web/Web/UI/Controls/DataBindingPanel.cs @@ -59,7 +59,7 @@ namespace Spring.Web.UI.Controls private const string ATTR_MESSAGEID = "MessageId"; private const string ATTR_ERRORPROVIDERS = "ErrorProviders"; - private static readonly ILog Log = LogManager.GetLogger(typeof(DataBindingPanel)); + private static readonly ILogger Log = LogManager.GetLogger(); private delegate void TraversalAction(IWebDataBound bindingContainer, WebControl wc); diff --git a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AdvisorAutoProxyCreatorCircularReferencesTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AdvisorAutoProxyCreatorCircularReferencesTests.cs index eb987593..a1e51ea1 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AdvisorAutoProxyCreatorCircularReferencesTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Framework/AutoProxy/AdvisorAutoProxyCreatorCircularReferencesTests.cs @@ -20,8 +20,6 @@ #region Imports -using System; -using System.Collections.Generic; using System.Reflection; using Microsoft.Extensions.Logging; using NUnit.Framework; diff --git a/test/Spring/Spring.Aop.Tests/Aop/Support/SdkRegularExpressionMethodPointcutTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Support/SdkRegularExpressionMethodPointcutTests.cs index 00c37927..a0684fbd 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Support/SdkRegularExpressionMethodPointcutTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Support/SdkRegularExpressionMethodPointcutTests.cs @@ -19,7 +19,7 @@ #endregion #region Imports -using System; + using System.Text.RegularExpressions; using Microsoft.Extensions.Logging.Abstractions; using NUnit.Framework; diff --git a/test/Spring/Spring.Aop.Tests/Aop/Target/PrototypeTargetSourceTests.cs b/test/Spring/Spring.Aop.Tests/Aop/Target/PrototypeTargetSourceTests.cs index deca6121..f70d592d 100644 --- a/test/Spring/Spring.Aop.Tests/Aop/Target/PrototypeTargetSourceTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aop/Target/PrototypeTargetSourceTests.cs @@ -18,8 +18,6 @@ #endregion -using System; - using FakeItEasy; using Microsoft.Extensions.Logging.Abstractions; using NUnit.Framework; diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Exception/ExceptionHandlerAspectIntegrationTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/Exception/ExceptionHandlerAspectIntegrationTests.cs index e131798f..7b615112 100644 --- a/test/Spring/Spring.Aop.Tests/Aspects/Exception/ExceptionHandlerAspectIntegrationTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aspects/Exception/ExceptionHandlerAspectIntegrationTests.cs @@ -20,9 +20,7 @@ #region Imports -using System; using System.Collections; -using System.Collections.Generic; using Microsoft.Extensions.Logging; using NUnit.Framework; using Spring.Aop.Framework; diff --git a/test/Spring/Spring.Aop.Tests/Aspects/Logging/SimpleLoggingAdviceTests.cs b/test/Spring/Spring.Aop.Tests/Aspects/Logging/SimpleLoggingAdviceTests.cs index f01d7d1b..192abf05 100644 --- a/test/Spring/Spring.Aop.Tests/Aspects/Logging/SimpleLoggingAdviceTests.cs +++ b/test/Spring/Spring.Aop.Tests/Aspects/Logging/SimpleLoggingAdviceTests.cs @@ -18,7 +18,6 @@ #endregion -using System; using System.Reflection; using AopAlliance.Intercept; diff --git a/test/Spring/Spring.Core.Tests/Core/IO/ResourceConverterTests.cs b/test/Spring/Spring.Core.Tests/Core/IO/ResourceConverterTests.cs index 1e1b6c8e..fc56852f 100644 --- a/test/Spring/Spring.Core.Tests/Core/IO/ResourceConverterTests.cs +++ b/test/Spring/Spring.Core.Tests/Core/IO/ResourceConverterTests.cs @@ -20,7 +20,6 @@ #region Imports -using System; using Microsoft.Extensions.Logging.Abstractions; using NUnit.Framework; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/LogFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/LogFactoryObjectTests.cs index f8f3a160..914a25c8 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Config/LogFactoryObjectTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Config/LogFactoryObjectTests.cs @@ -20,7 +20,6 @@ #region Imports -using System; using NUnit.Framework; #endregion diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectCollectionTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectCollectionTests.cs index 6254908b..f6076f8a 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectCollectionTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectCollectionTests.cs @@ -18,10 +18,7 @@ #endregion -using System; using System.Collections; -using System.IO; -using System.Linq; using System.Text; using Microsoft.Extensions.Logging.Abstractions; using NUnit.Framework; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectFactoryTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectFactoryTests.cs index 010d4cd2..68cdff81 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectFactoryTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Xml/XmlObjectFactoryTests.cs @@ -14,13 +14,10 @@ * limitations under the License. */ -using System; using System.Collections; using System.Data; using System.Globalization; -using System.IO; using System.Text; -using System.Threading; #if !NETCOREAPP using System.Web.Services; #endif diff --git a/test/Spring/Spring.Core.Tests/Objects/ObjectWrapperTests.cs b/test/Spring/Spring.Core.Tests/Objects/ObjectWrapperTests.cs index 0f97abc7..4f48bed6 100644 --- a/test/Spring/Spring.Core.Tests/Objects/ObjectWrapperTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/ObjectWrapperTests.cs @@ -20,13 +20,10 @@ #region Imports -using System; using System.Collections; -using System.Collections.Generic; using System.Collections.Specialized; using System.ComponentModel; using System.Globalization; -using System.IO; using System.Reflection; using System.Runtime.CompilerServices; diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/AdoTemplateTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/AdoTemplateTests.cs index 6105b9ef..8803c2b7 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/AdoTemplateTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/AdoTemplateTests.cs @@ -52,16 +52,6 @@ namespace Spring.Data #endregion - #region Constants - - /// - /// The shared ILog instance for this class (and derived classes). - /// - protected static readonly ILog log = - LogManager.GetLogger(typeof (AdoTemplateTests)); - - #endregion - #region Constructor (s) /// /// Initializes a new instance of the class. diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/ConsoleLoggingAroundAdvice.cs b/test/Spring/Spring.Data.Integration.Tests/Data/ConsoleLoggingAroundAdvice.cs index b04fd4bf..51447399 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/ConsoleLoggingAroundAdvice.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/ConsoleLoggingAroundAdvice.cs @@ -5,7 +5,7 @@ namespace Spring.Data { public class ConsoleLoggingAroundAdvice : IMethodInterceptor { - private static readonly ILog LOG = LogManager.GetLogger(typeof(ConsoleLoggingAroundAdvice)); + private static readonly ILog LOG = LogManager.GetLogger(); public object Invoke(IMethodInvocation invocation) { LOG.LogDebug("Advice executing; calling the advised method [" + invocation.Method.Name + "]"); diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/MappingAdoQueryTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/MappingAdoQueryTests.cs index ccf69b27..d1127450 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/MappingAdoQueryTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/MappingAdoQueryTests.cs @@ -44,12 +44,6 @@ namespace Spring.Data #region Constants - /// - /// The shared ILog instance for this class (and derived classes). - /// - protected static readonly ILog log = - LogManager.GetLogger(typeof(MappingAdoQueryTests)); - private IApplicationContext ctx; #endregion diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/OracleAdoTemplateTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/OracleAdoTemplateTests.cs index 921a4458..660afa1c 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/OracleAdoTemplateTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/OracleAdoTemplateTests.cs @@ -65,8 +65,7 @@ namespace Spring.Data /// /// The shared ILog instance for this class (and derived classes). /// - protected static readonly ILog log = - LogManager.GetLogger(typeof (OracleAdoTemplateTests)); + protected static readonly ILog log = LogManager.GetLogger(); private class TestObjectExtractor : IResultSetExtractor { diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/Support/SimpleExceptionTranslationTests.cs b/test/Spring/Spring.Data.Integration.Tests/Data/Support/SimpleExceptionTranslationTests.cs index 662b914f..64c6464a 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/Support/SimpleExceptionTranslationTests.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/Support/SimpleExceptionTranslationTests.cs @@ -45,8 +45,7 @@ namespace Spring.Data.Support /// /// The shared ILog instance for this class (and derived classes). /// - protected static readonly ILog log = - LogManager.GetLogger(typeof(SimpleExceptionTranslationTests)); + protected static readonly ILog log = LogManager.GetLogger(); #endregion diff --git a/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectManager.cs b/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectManager.cs index 9b4b8ff6..27f7f118 100644 --- a/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectManager.cs +++ b/test/Spring/Spring.Data.Integration.Tests/Data/TestObjectManager.cs @@ -38,7 +38,7 @@ namespace Spring.Data { #region Fields ITestObjectDao testObjectDao; - private static readonly ILog LOG = LogManager.GetLogger(typeof(TestObjectManager)); + private static readonly ILogger LOG = LogManager.GetLogger(); #endregion #region Constructor (s) diff --git a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/AuditDao.cs b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/AuditDao.cs index e13a5723..3f9c0370 100644 --- a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/AuditDao.cs +++ b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/AuditDao.cs @@ -6,8 +6,7 @@ namespace Spring.Data.NHibernate { public class AuditDao : AdoDaoSupport, IAuditDao { - protected static readonly ILog logger = - LogManager.GetLogger(typeof(AuditDao)); + protected static readonly ILog logger = LogManager.GetLogger(); public void AuditOperation(string operationIdenfitier) { logger.LogDebug("Executing AUDIT operation."); @@ -17,4 +16,4 @@ namespace Spring.Data.NHibernate logger.LogDebug("AUDIT operation done."); } } -} \ No newline at end of file +} diff --git a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/HibernateTxScopeTransactionManagerTests.cs b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/HibernateTxScopeTransactionManagerTests.cs index e1065406..2bd82025 100644 --- a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/HibernateTxScopeTransactionManagerTests.cs +++ b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/HibernateTxScopeTransactionManagerTests.cs @@ -45,12 +45,6 @@ namespace Spring.Data.NHibernate [Ignore("Bug Fix in Progress...unignore once resolved and tests are cleaned up")] public class HibernateTxScopeTransactionManagerTests { - /// - /// The shared instance for this class (and derived classes). - /// - protected static readonly ILog log = - LogManager.GetLogger(typeof(HibernateTxScopeTransactionManagerTests)); - private IApplicationContext ctx; private IDbProvider dbProvider; diff --git a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/MultipleDbTests.cs b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/MultipleDbTests.cs index 45c37107..fe3ff8df 100644 --- a/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/MultipleDbTests.cs +++ b/test/Spring/Spring.Data.NHibernate5.Integration.Tests/Data/NHibernate/MultipleDbTests.cs @@ -44,17 +44,6 @@ namespace Spring.Data.NHibernate #endregion - - #region Constants - - /// - /// The shared instance for this class (and derived classes). - /// - protected static readonly ILog log = - LogManager.GetLogger(typeof(TemplateTests)); - - #endregion - #region Constructor (s) /// diff --git a/test/Spring/Spring.Data.Tests/Data/LoggingAroundAdvice.cs b/test/Spring/Spring.Data.Tests/Data/LoggingAroundAdvice.cs index 210f3ec2..2b3676be 100644 --- a/test/Spring/Spring.Data.Tests/Data/LoggingAroundAdvice.cs +++ b/test/Spring/Spring.Data.Tests/Data/LoggingAroundAdvice.cs @@ -7,7 +7,7 @@ namespace Spring.Data public class LoggingAroundAdvice : IMethodInterceptor { public int numInvoked; - private static readonly ILog LOG = LogManager.GetLogger(typeof(LoggingAroundAdvice)); + private static readonly ILogger LOG = LogManager.GetLogger(); public object Invoke(IMethodInvocation invocation) { try diff --git a/test/Spring/Spring.Data.Tests/Data/TestObjectMgr.cs b/test/Spring/Spring.Data.Tests/Data/TestObjectMgr.cs index 10da08c7..c5de13fd 100644 --- a/test/Spring/Spring.Data.Tests/Data/TestObjectMgr.cs +++ b/test/Spring/Spring.Data.Tests/Data/TestObjectMgr.cs @@ -30,7 +30,7 @@ namespace Spring.Data /// Mark Pollack (.NET) public class TestObjectMgr : ITestObjectMgr { - private static readonly ILog LOG = LogManager.GetLogger(typeof(TestObjectMgr)); + private static readonly ILogger LOG = LogManager.GetLogger(); /// /// Initializes a new instance of the class. diff --git a/test/Spring/Spring.Messaging.Ems.Integration.Tests/Messaging/Ems/Core/SimpleMessageListener.cs b/test/Spring/Spring.Messaging.Ems.Integration.Tests/Messaging/Ems/Core/SimpleMessageListener.cs index 4e567162..322e3858 100644 --- a/test/Spring/Spring.Messaging.Ems.Integration.Tests/Messaging/Ems/Core/SimpleMessageListener.cs +++ b/test/Spring/Spring.Messaging.Ems.Integration.Tests/Messaging/Ems/Core/SimpleMessageListener.cs @@ -5,7 +5,7 @@ namespace Spring.Messaging.Ems.Core { public class SimpleMessageListener : IMessageListener { - private static readonly ILog LOG = LogManager.GetLogger(typeof(SimpleMessageListener)); + private static readonly ILogger LOG = LogManager.GetLogger(); private int messageCount; diff --git a/test/Spring/Spring.Messaging.Nms.Integration.Tests/Messaging/Nms/Core/SimpleMessageListener.cs b/test/Spring/Spring.Messaging.Nms.Integration.Tests/Messaging/Nms/Core/SimpleMessageListener.cs index 1f3ec561..4f589e58 100644 --- a/test/Spring/Spring.Messaging.Nms.Integration.Tests/Messaging/Nms/Core/SimpleMessageListener.cs +++ b/test/Spring/Spring.Messaging.Nms.Integration.Tests/Messaging/Nms/Core/SimpleMessageListener.cs @@ -26,7 +26,7 @@ namespace Spring.Messaging.Nms.Core public class SimpleMessageListener : IMessageListener { - private static readonly ILog LOG = LogManager.GetLogger(typeof(SimpleMessageListener)); + private static readonly ILogger LOG = LogManager.GetLogger(); private int messageCount; diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/SimpleMessageListener.cs b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/SimpleMessageListener.cs index f63f7261..971712d2 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/SimpleMessageListener.cs +++ b/test/Spring/Spring.Messaging.Nms.Tests/Messaging/Nms/Integration/SimpleMessageListener.cs @@ -10,7 +10,7 @@ namespace Spring.Messaging.Nms.Integration { #region Logging Definition - private static readonly ILog LOG = LogManager.GetLogger(typeof(SimpleMessageListener)); + private static readonly ILogger LOG = LogManager.GetLogger(); #endregion private IMessage lastReceivedMessage; diff --git a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/LoggingExceptionHandler.cs b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/LoggingExceptionHandler.cs index 14c6adb1..2a3fb751 100644 --- a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/LoggingExceptionHandler.cs +++ b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/LoggingExceptionHandler.cs @@ -1,6 +1,4 @@ -using System; using System.Messaging; -using System.Threading; using Microsoft.Extensions.Logging; namespace Spring.Messaging.Listener diff --git a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleExceptionHandler.cs b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleExceptionHandler.cs index 331c8b6a..4c66dc17 100644 --- a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleExceptionHandler.cs +++ b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleExceptionHandler.cs @@ -7,7 +7,7 @@ namespace Spring.Messaging.Listener { #region Logging - private static readonly ILog LOG = LogManager.GetLogger(typeof(SimpleExceptionHandler)); + private static readonly ILogger LOG = LogManager.GetLogger(); #endregion diff --git a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleHandler.cs b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleHandler.cs index 2924a37a..8944d313 100644 --- a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleHandler.cs +++ b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleHandler.cs @@ -1,6 +1,3 @@ - - -using System; using Microsoft.Extensions.Logging; namespace Spring.Messaging.Listener @@ -9,7 +6,7 @@ namespace Spring.Messaging.Listener { #region Logging - private static readonly ILog LOG = LogManager.GetLogger(typeof(SimpleHandler)); + private static readonly ILogger LOG = LogManager.GetLogger(); #endregion diff --git a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleMessageListener.cs b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleMessageListener.cs index 0655e4f4..1b9dc81d 100644 --- a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleMessageListener.cs +++ b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/SimpleMessageListener.cs @@ -9,7 +9,7 @@ namespace Spring.Messaging.Listener { #region Logging Definition - private static readonly ILog LOG = LogManager.GetLogger(typeof(SimpleMessageListener)); + private static readonly ILogger LOG = LogManager.GetLogger(); #endregion private Message lastReceivedMessage; diff --git a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/WaitingHandler.cs b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/WaitingHandler.cs index b5b8f460..253fb4fc 100644 --- a/test/Spring/Spring.Messaging.Tests/Messaging/Listener/WaitingHandler.cs +++ b/test/Spring/Spring.Messaging.Tests/Messaging/Listener/WaitingHandler.cs @@ -1,7 +1,3 @@ - - -using System; -using System.Threading; using Microsoft.Extensions.Logging; namespace Spring.Messaging.Listener @@ -10,7 +6,7 @@ namespace Spring.Messaging.Listener { #region Logging - private static readonly ILog LOG = LogManager.GetLogger(typeof(WaitingHandler)); + private static readonly ILogger LOG = LogManager.GetLogger(); #endregion diff --git a/test/Spring/Spring.Services.Tests/EnterpriseServices/ExeConfigurationSystemTests.cs b/test/Spring/Spring.Services.Tests/EnterpriseServices/ExeConfigurationSystemTests.cs index c712e199..7d378027 100644 --- a/test/Spring/Spring.Services.Tests/EnterpriseServices/ExeConfigurationSystemTests.cs +++ b/test/Spring/Spring.Services.Tests/EnterpriseServices/ExeConfigurationSystemTests.cs @@ -20,7 +20,6 @@ using System.Configuration; using System.Configuration.Internal; -using System.IO; using NUnit.Framework; using Spring.Util; diff --git a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/SerializeConversationTestModule.cs b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/SerializeConversationTestModule.cs index ffa2e077..74be852e 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/SerializeConversationTestModule.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/SerializeConversationTestModule.cs @@ -34,7 +34,7 @@ namespace Spring.Web.Conversation { #region Logging - private static readonly ILog LOG = LogManager.GetLogger(typeof(SerializeConversationTestModule)); + private static readonly ILogger LOG = LogManager.GetLogger(); #endregion @@ -202,7 +202,7 @@ namespace Spring.Web.Conversation { #region Logging - private static readonly ILog LOG = LogManager.GetLogger(typeof(SerializeConversationTestModule)); + private static readonly ILogger LOG = LogManager.GetLogger(); #endregion diff --git a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/WebConversationStateTest.cs b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/WebConversationStateTest.cs index 80dbc5fe..77c4a700 100644 Binary files a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/WebConversationStateTest.cs and b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Conversation/WebConversationStateTest.cs differ diff --git a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Data/Spring/Conversation/WebConversationStateTest/CircularDependenceTest.aspx.cs b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Data/Spring/Conversation/WebConversationStateTest/CircularDependenceTest.aspx.cs index b61aa253..eef5876a 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Data/Spring/Conversation/WebConversationStateTest/CircularDependenceTest.aspx.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Data/Spring/Conversation/WebConversationStateTest/CircularDependenceTest.aspx.cs @@ -1,4 +1,3 @@ -using System; using System.Text; using Microsoft.Extensions.Logging; using Spring; @@ -8,7 +7,7 @@ using Spring.Web.Conversation; public partial class CircularDependenceTest : System.Web.UI.Page, IApplicationContextAware { - private static readonly ILog LOG = LogManager.GetLogger(typeof(CircularDependenceTest)); + private static readonly ILogger LOG = LogManager.GetLogger(); protected void Page_Load(object sender, EventArgs e) { diff --git a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Data/Spring/Conversation/WebConversationStateTest/IoeTests.aspx.cs b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Data/Spring/Conversation/WebConversationStateTest/IoeTests.aspx.cs index 29139815..87db9117 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Data/Spring/Conversation/WebConversationStateTest/IoeTests.aspx.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Data/Spring/Conversation/WebConversationStateTest/IoeTests.aspx.cs @@ -1,14 +1,11 @@ using Spring.Web.Conversation; using System.Text.RegularExpressions; using NHibernate; -using Spring; using Spring.Data.NHibernate.Support; using Spring.Objects.Factory; public partial class IoeTests : System.Web.UI.Page { - private static readonly ILog LOG = LogManager.GetLogger(typeof(IoeTests)); - private IConversationState conversationA; public IConversationState ConversationA { diff --git a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Data/Spring/Conversation/WebConversationStateTest/SPCLazyLoadTest_A_Status.aspx.cs b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Data/Spring/Conversation/WebConversationStateTest/SPCLazyLoadTest_A_Status.aspx.cs index 701955a7..1a7f56d7 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Data/Spring/Conversation/WebConversationStateTest/SPCLazyLoadTest_A_Status.aspx.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Data/Spring/Conversation/WebConversationStateTest/SPCLazyLoadTest_A_Status.aspx.cs @@ -6,7 +6,7 @@ using Spring; public partial class SPCLazyLoadTest_A_Status : System.Web.UI.Page { - private static readonly ILog LOG = LogManager.GetLogger(typeof(SPCLazyLoadTest_A_Status)); + private static readonly ILogger LOG = LogManager.GetLogger(); private IConversationState conversation; public IConversationState Conversation diff --git a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Data/Spring/Conversation/WebConversationStateTest/SPCSwitchConversationSameRequest.aspx.cs b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Data/Spring/Conversation/WebConversationStateTest/SPCSwitchConversationSameRequest.aspx.cs index bdfd0a1c..b1d1a79f 100644 --- a/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Data/Spring/Conversation/WebConversationStateTest/SPCSwitchConversationSameRequest.aspx.cs +++ b/test/Spring/Spring.Web.Conversation.NHibernate5.Tests/Data/Spring/Conversation/WebConversationStateTest/SPCSwitchConversationSameRequest.aspx.cs @@ -1,4 +1,3 @@ -using System; using Microsoft.Extensions.Logging; using Spring.Web.Conversation; using Spring.Entities; @@ -7,7 +6,7 @@ using Spring; public partial class SPCSwitchConversationSameRequest : System.Web.UI.Page { - private static readonly ILog LOG = LogManager.GetLogger(typeof(SPCSwitchConversationSameRequest)); + private static readonly ILogger LOG = LogManager.GetLogger(); private IConversationState conversationA; public IConversationState ConversationA diff --git a/test/Spring/Spring.Web.Tests/Data/Spring/Objects/Factory/Support/TestForm.aspx.cs b/test/Spring/Spring.Web.Tests/Data/Spring/Objects/Factory/Support/TestForm.aspx.cs index 6d247690..f5b6f198 100644 --- a/test/Spring/Spring.Web.Tests/Data/Spring/Objects/Factory/Support/TestForm.aspx.cs +++ b/test/Spring/Spring.Web.Tests/Data/Spring/Objects/Factory/Support/TestForm.aspx.cs @@ -1,11 +1,10 @@ -using System; using Microsoft.Extensions.Logging; namespace Spring.Data.Objects.Factory.Support { public class TestForm : Spring.Web.UI.Page { - private ILog _log = LogManager.GetLogger(typeof(TestForm)); + private ILogger _log = LogManager.GetLogger(); public TestForm() {