fixing changes related to upgrades to Common.Logging 2.0
This commit is contained in:
Steve Bohlen
File diff suppressed because it is too large
Load Diff
@@ -4,6 +4,168 @@
|
||||
<name>Spring.Web.Mvc4</name>
|
||||
</assembly>
|
||||
<members>
|
||||
<member name="T:Spring.Context.Support.MvcContextHandler">
|
||||
<summary>
|
||||
Context Handler for ASP.NET MVC Applications
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:Spring.Context.Support.MvcApplicationContextArgs">
|
||||
<summary>
|
||||
Encapsulates arguments to the <see cref="T:Spring.Context.Support.MvcApplicationContext"/> class.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Spring.Context.Support.MvcApplicationContextArgs.#ctor">
|
||||
<summary>
|
||||
Initializes a new instance of the MvcApplicationContextArgs class.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Spring.Context.Support.MvcApplicationContextArgs.#ctor(System.String,Spring.Context.IApplicationContext,System.String[],Spring.Core.IO.IResource[])">
|
||||
<summary>
|
||||
Initializes a new instance of the MvcApplicationContextArgs class.
|
||||
</summary>
|
||||
<param name="name">The name.</param>
|
||||
<param name="parentContext">The parent context.</param>
|
||||
<param name="configurationLocations">The configuration locations.</param>
|
||||
<param name="configurationResources">The configuration resources.</param>
|
||||
</member>
|
||||
<member name="M:Spring.Context.Support.MvcApplicationContextArgs.#ctor(System.String,Spring.Context.IApplicationContext,System.String[],Spring.Core.IO.IResource[],System.Boolean)">
|
||||
<summary>
|
||||
Initializes a new instance of the MvcApplicationContextArgs class.
|
||||
</summary>
|
||||
<param name="name">The name.</param>
|
||||
<param name="parentContext">The parent context.</param>
|
||||
<param name="configurationLocations">The configuration locations.</param>
|
||||
<param name="configurationResources">The configuration resources.</param>
|
||||
<param name="caseSensitive">if set to <c>true</c> [case sensitive].</param>
|
||||
</member>
|
||||
<member name="T:Spring.Web.Mvc.SpringMvcDependencyResolver">
|
||||
<summary>
|
||||
Spring-based implementation of the <see cref="T:System.Web.Mvc.IDependencyResolver"/> interface for ASP.NET MVC.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Spring.Web.Mvc.SpringMvcDependencyResolver.#ctor(Spring.Context.IApplicationContext)">
|
||||
<summary>
|
||||
Initializes a new instance of the <see cref="T:Spring.Web.Mvc.SpringMvcDependencyResolver"/> class.
|
||||
</summary>
|
||||
<param name="context">The <see cref="T:Spring.Context.IApplicationContext"/> to be used by the resolver</param>
|
||||
</member>
|
||||
<member name="M:Spring.Web.Mvc.SpringMvcDependencyResolver.GetService(System.Type)">
|
||||
<summary>
|
||||
Resolves singly registered services that support arbitrary object creation.
|
||||
</summary>
|
||||
<param name="serviceType">The type of the requested service or object.</param>
|
||||
<returns>The requested service or object.</returns>
|
||||
</member>
|
||||
<member name="M:Spring.Web.Mvc.SpringMvcDependencyResolver.GetServices(System.Type)">
|
||||
<summary>
|
||||
Resolves multiply registered services.
|
||||
</summary>
|
||||
<param name="serviceType">The type of the requested services.</param>
|
||||
<returns>The requested services.</returns>
|
||||
</member>
|
||||
<member name="P:Spring.Web.Mvc.SpringMvcDependencyResolver.ApplicationContext">
|
||||
<summary>
|
||||
Gets the application context.
|
||||
</summary>
|
||||
<value>The application context.</value>
|
||||
</member>
|
||||
<member name="P:Spring.Web.Mvc.SpringMvcDependencyResolver.ApplicationContextName">
|
||||
<summary>
|
||||
Gets or sets the name of the application context.
|
||||
</summary>
|
||||
<remarks>
|
||||
Defaults to using the root (default) Application Context.
|
||||
</remarks>
|
||||
<value>The name of the application context.</value>
|
||||
</member>
|
||||
<member name="T:Spring.Web.Mvc.SpringWebApiDependencyResolver">
|
||||
<summary>
|
||||
Spring-based implementation of the <see cref="T:System.Web.Http.Services.IDependencyResolver"/> interface for ASP.NET MVC Web API.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Spring.Web.Mvc.SpringWebApiDependencyResolver.#ctor(Spring.Context.IApplicationContext)">
|
||||
<summary>
|
||||
Initializes a new instance of the <see cref="T:Spring.Web.Mvc.SpringMvcDependencyResolver"/> class.
|
||||
</summary>
|
||||
<param name="context">The <see cref="T:Spring.Context.IApplicationContext"/> to be used by the resolver</param>
|
||||
</member>
|
||||
<member name="T:Spring.Web.Mvc.SpringMvcApplication">
|
||||
<summary>
|
||||
Spring.NET-specific HttpApplication for ASP.NET MVC integration.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Spring.Web.Mvc.SpringMvcApplication.Init">
|
||||
<summary>
|
||||
Executes custom initialization code after all event handler modules have been added.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Spring.Web.Mvc.SpringMvcApplication.Application_BeginRequest(System.Object,System.EventArgs)">
|
||||
<summary>
|
||||
Handles the BeginRequest event of the Application control.
|
||||
</summary>
|
||||
<param name="sender">The source of the event.</param>
|
||||
<param name="e">The <see cref="T:System.EventArgs"/> instance containing the event data.</param>
|
||||
</member>
|
||||
<member name="M:Spring.Web.Mvc.SpringMvcApplication.BuildDependencyResolver">
|
||||
<summary>
|
||||
Builds the dependency resolver.
|
||||
</summary>
|
||||
<returns>The <see cref="T:System.Web.Mvc.IDependencyResolver"/> instance.</returns>
|
||||
You must override this method in a derived class to control the manner in which the
|
||||
<see cref="T:System.Web.Mvc.IDependencyResolver"/> is created.
|
||||
</member>
|
||||
<member name="M:Spring.Web.Mvc.SpringMvcApplication.BuildWebApiDependencyResolver">
|
||||
<summary>
|
||||
Builds the dependency resolver.
|
||||
</summary>
|
||||
<returns>The <see cref="T:System.Web.Http.Services.IDependencyResolver"/> instance.</returns>
|
||||
You must override this method in a derived class to control the manner in which the
|
||||
<see cref="T:System.Web.Http.Services.IDependencyResolver"/> is created.
|
||||
</member>
|
||||
<member name="M:Spring.Web.Mvc.SpringMvcApplication.ConfigureApplicationContext">
|
||||
<summary>
|
||||
Configures the <see cref="T:Spring.Context.IApplicationContext"/> instance.
|
||||
</summary>
|
||||
<remarks>
|
||||
You must override this method in a derived class to control the manner in which the
|
||||
<see cref="T:Spring.Context.IApplicationContext"/> is configured.
|
||||
</remarks>
|
||||
</member>
|
||||
<member name="M:Spring.Web.Mvc.SpringMvcApplication.RegisterDependencyResolver(System.Web.Mvc.IDependencyResolver)">
|
||||
<summary>
|
||||
Registers the DependencyResolver implementation with the MVC runtime.
|
||||
<remarks>
|
||||
You must override this method in a derived class to control the manner in which the
|
||||
<see cref="T:System.Web.Mvc.IDependencyResolver"/> is registered.
|
||||
</remarks>
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Spring.Web.Mvc.SpringMvcApplication.RegisterDependencyResolver(System.Web.Http.Services.IDependencyResolver)">
|
||||
<summary>
|
||||
Registers the DependencyResolver implementation with the MVC runtime.
|
||||
<remarks>
|
||||
You must override this method in a derived class to control the manner in which the
|
||||
<see cref="T:System.Web.Http.Services.IDependencyResolver"/> is registered.
|
||||
</remarks>
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:Spring.Web.Mvc.SpringMvcApplication.ThreadSafeDependencyResolverRegistrar">
|
||||
<summary>
|
||||
Thread-safe class that ensures that the <see cref="T:System.Web.Mvc.IDependencyResolver"/> is registered only once.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Spring.Web.Mvc.SpringMvcApplication.ThreadSafeDependencyResolverRegistrar.Register(System.Web.Mvc.IDependencyResolver)">
|
||||
<summary>
|
||||
Registers the specified <see cref="T:System.Web.Mvc.IDependencyResolver"/>.
|
||||
</summary>
|
||||
<param name="resolver">The resolver.</param>
|
||||
</member>
|
||||
<member name="M:Spring.Web.Mvc.SpringMvcApplication.ThreadSafeDependencyResolverRegistrar.Register(System.Web.Http.Services.IDependencyResolver)">
|
||||
<summary>
|
||||
Registers the specified <see cref="T:System.Web.Http.Services.IDependencyResolver"/>.
|
||||
</summary>
|
||||
<param name="resolver">The resolver.</param>
|
||||
</member>
|
||||
<member name="T:Spring.Context.Support.MvcApplicationContext">
|
||||
<summary>
|
||||
Application Context for ASP.NET MVC Applications
|
||||
@@ -86,167 +248,5 @@
|
||||
An array of <see cref="T:Spring.Core.IO.IResource"/>s, or <see langword="null"/> if none.
|
||||
</returns>
|
||||
</member>
|
||||
<member name="T:Spring.Context.Support.MvcApplicationContextArgs">
|
||||
<summary>
|
||||
Encapsulates arguments to the <see cref="T:Spring.Context.Support.MvcApplicationContext"/> class.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Spring.Context.Support.MvcApplicationContextArgs.#ctor">
|
||||
<summary>
|
||||
Initializes a new instance of the MvcApplicationContextArgs class.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Spring.Context.Support.MvcApplicationContextArgs.#ctor(System.String,Spring.Context.IApplicationContext,System.String[],Spring.Core.IO.IResource[])">
|
||||
<summary>
|
||||
Initializes a new instance of the MvcApplicationContextArgs class.
|
||||
</summary>
|
||||
<param name="name">The name.</param>
|
||||
<param name="parentContext">The parent context.</param>
|
||||
<param name="configurationLocations">The configuration locations.</param>
|
||||
<param name="configurationResources">The configuration resources.</param>
|
||||
</member>
|
||||
<member name="M:Spring.Context.Support.MvcApplicationContextArgs.#ctor(System.String,Spring.Context.IApplicationContext,System.String[],Spring.Core.IO.IResource[],System.Boolean)">
|
||||
<summary>
|
||||
Initializes a new instance of the MvcApplicationContextArgs class.
|
||||
</summary>
|
||||
<param name="name">The name.</param>
|
||||
<param name="parentContext">The parent context.</param>
|
||||
<param name="configurationLocations">The configuration locations.</param>
|
||||
<param name="configurationResources">The configuration resources.</param>
|
||||
<param name="caseSensitive">if set to <c>true</c> [case sensitive].</param>
|
||||
</member>
|
||||
<member name="T:Spring.Context.Support.MvcContextHandler">
|
||||
<summary>
|
||||
Context Handler for ASP.NET MVC Applications
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:Spring.Web.Mvc.SpringMvcDependencyResolver">
|
||||
<summary>
|
||||
Spring-based implementation of the <see cref="T:System.Web.Mvc.IDependencyResolver"/> interface for ASP.NET MVC.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Spring.Web.Mvc.SpringMvcDependencyResolver.#ctor(Spring.Context.IApplicationContext)">
|
||||
<summary>
|
||||
Initializes a new instance of the <see cref="T:Spring.Web.Mvc.SpringMvcDependencyResolver"/> class.
|
||||
</summary>
|
||||
<param name="context">The <see cref="T:Spring.Context.IApplicationContext"/> to be used by the resolver</param>
|
||||
</member>
|
||||
<member name="M:Spring.Web.Mvc.SpringMvcDependencyResolver.GetService(System.Type)">
|
||||
<summary>
|
||||
Resolves singly registered services that support arbitrary object creation.
|
||||
</summary>
|
||||
<param name="serviceType">The type of the requested service or object.</param>
|
||||
<returns>The requested service or object.</returns>
|
||||
</member>
|
||||
<member name="M:Spring.Web.Mvc.SpringMvcDependencyResolver.GetServices(System.Type)">
|
||||
<summary>
|
||||
Resolves multiply registered services.
|
||||
</summary>
|
||||
<param name="serviceType">The type of the requested services.</param>
|
||||
<returns>The requested services.</returns>
|
||||
</member>
|
||||
<member name="P:Spring.Web.Mvc.SpringMvcDependencyResolver.ApplicationContext">
|
||||
<summary>
|
||||
Gets the application context.
|
||||
</summary>
|
||||
<value>The application context.</value>
|
||||
</member>
|
||||
<member name="P:Spring.Web.Mvc.SpringMvcDependencyResolver.ApplicationContextName">
|
||||
<summary>
|
||||
Gets or sets the name of the application context.
|
||||
</summary>
|
||||
<remarks>
|
||||
Defaults to using the root (default) Application Context.
|
||||
</remarks>
|
||||
<value>The name of the application context.</value>
|
||||
</member>
|
||||
<member name="T:Spring.Web.Mvc.SpringMvcApplication">
|
||||
<summary>
|
||||
Spring.NET-specific HttpApplication for ASP.NET MVC integration.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Spring.Web.Mvc.SpringMvcApplication.Init">
|
||||
<summary>
|
||||
Executes custom initialization code after all event handler modules have been added.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Spring.Web.Mvc.SpringMvcApplication.Application_BeginRequest(System.Object,System.EventArgs)">
|
||||
<summary>
|
||||
Handles the BeginRequest event of the Application control.
|
||||
</summary>
|
||||
<param name="sender">The source of the event.</param>
|
||||
<param name="e">The <see cref="T:System.EventArgs"/> instance containing the event data.</param>
|
||||
</member>
|
||||
<member name="M:Spring.Web.Mvc.SpringMvcApplication.BuildDependencyResolver">
|
||||
<summary>
|
||||
Builds the dependency resolver.
|
||||
</summary>
|
||||
<returns>The <see cref="T:System.Web.Mvc.IDependencyResolver"/> instance.</returns>
|
||||
You must override this method in a derived class to control the manner in which the
|
||||
<see cref="T:System.Web.Mvc.IDependencyResolver"/> is created.
|
||||
</member>
|
||||
<member name="M:Spring.Web.Mvc.SpringMvcApplication.BuildWebApiDependencyResolver">
|
||||
<summary>
|
||||
Builds the dependency resolver.
|
||||
</summary>
|
||||
<returns>The <see cref="T:System.Web.Http.Services.IDependencyResolver"/> instance.</returns>
|
||||
You must override this method in a derived class to control the manner in which the
|
||||
<see cref="T:System.Web.Http.Services.IDependencyResolver"/> is created.
|
||||
</member>
|
||||
<member name="M:Spring.Web.Mvc.SpringMvcApplication.ConfigureApplicationContext">
|
||||
<summary>
|
||||
Configures the <see cref="T:Spring.Context.IApplicationContext"/> instance.
|
||||
</summary>
|
||||
<remarks>
|
||||
You must override this method in a derived class to control the manner in which the
|
||||
<see cref="T:Spring.Context.IApplicationContext"/> is configured.
|
||||
</remarks>
|
||||
</member>
|
||||
<member name="M:Spring.Web.Mvc.SpringMvcApplication.RegisterDependencyResolver(System.Web.Mvc.IDependencyResolver)">
|
||||
<summary>
|
||||
Registers the DependencyResolver implementation with the MVC runtime.
|
||||
<remarks>
|
||||
You must override this method in a derived class to control the manner in which the
|
||||
<see cref="T:System.Web.Mvc.IDependencyResolver"/> is registered.
|
||||
</remarks>
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Spring.Web.Mvc.SpringMvcApplication.RegisterDependencyResolver(System.Web.Http.Services.IDependencyResolver)">
|
||||
<summary>
|
||||
Registers the DependencyResolver implementation with the MVC runtime.
|
||||
<remarks>
|
||||
You must override this method in a derived class to control the manner in which the
|
||||
<see cref="T:System.Web.Http.Services.IDependencyResolver"/> is registered.
|
||||
</remarks>
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:Spring.Web.Mvc.SpringMvcApplication.ThreadSafeDependencyResolverRegistrar">
|
||||
<summary>
|
||||
Thread-safe class that ensures that the <see cref="T:System.Web.Mvc.IDependencyResolver"/> is registered only once.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Spring.Web.Mvc.SpringMvcApplication.ThreadSafeDependencyResolverRegistrar.Register(System.Web.Mvc.IDependencyResolver)">
|
||||
<summary>
|
||||
Registers the specified <see cref="T:System.Web.Mvc.IDependencyResolver"/>.
|
||||
</summary>
|
||||
<param name="resolver">The resolver.</param>
|
||||
</member>
|
||||
<member name="M:Spring.Web.Mvc.SpringMvcApplication.ThreadSafeDependencyResolverRegistrar.Register(System.Web.Http.Services.IDependencyResolver)">
|
||||
<summary>
|
||||
Registers the specified <see cref="T:System.Web.Http.Services.IDependencyResolver"/>.
|
||||
</summary>
|
||||
<param name="resolver">The resolver.</param>
|
||||
</member>
|
||||
<member name="T:Spring.Web.Mvc.SpringWebApiDependencyResolver">
|
||||
<summary>
|
||||
Spring-based implementation of the <see cref="T:System.Web.Http.Services.IDependencyResolver"/> interface for ASP.NET MVC Web API.
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Spring.Web.Mvc.SpringWebApiDependencyResolver.#ctor(Spring.Context.IApplicationContext)">
|
||||
<summary>
|
||||
Initializes a new instance of the <see cref="T:Spring.Web.Mvc.SpringMvcDependencyResolver"/> class.
|
||||
</summary>
|
||||
<param name="context">The <see cref="T:Spring.Context.IApplicationContext"/> to be used by the resolver</param>
|
||||
</member>
|
||||
</members>
|
||||
</doc>
|
||||
|
||||
@@ -7,10 +7,7 @@ namespace Spring.Aspects.Exceptions
|
||||
{
|
||||
public static readonly string NAME = "capturingLogger";
|
||||
public CaptureOutputLogger()
|
||||
: base(NAME, LogLevel.All, false, false, null)
|
||||
|
||||
// TODO: use this line when upgrading to Common.Logging 2.0:
|
||||
// : base(false, NAME, LogLevel.All, true, false, false, null)
|
||||
: base(false, NAME, LogLevel.All, true, false, false, null)
|
||||
{ }
|
||||
|
||||
// private LogLevel _currentLogLevel = LogLevel.All;
|
||||
|
||||
@@ -7,9 +7,7 @@
|
||||
<section name="context" type="Spring.Context.Support.ContextHandler, Spring.Core"/>
|
||||
</sectionGroup>
|
||||
|
||||
<sectionGroup name="common">
|
||||
<section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />
|
||||
</sectionGroup>
|
||||
<section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />
|
||||
|
||||
</configSections>
|
||||
|
||||
@@ -17,10 +15,10 @@
|
||||
<add key="key" value="from custom config!"/>
|
||||
</appSettings>
|
||||
|
||||
<common>
|
||||
<logging>
|
||||
<factoryAdapter type="Common.Logging.Simple.TraceLoggerFactoryAdapter, Common.Logging"/>
|
||||
</logging>
|
||||
</common>
|
||||
|
||||
<logging>
|
||||
<factoryAdapter type="Common.Logging.Simple.TraceLoggerFactoryAdapter, Common.Logging"/>
|
||||
</logging>
|
||||
|
||||
|
||||
</configuration>
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
using System.Configuration;
|
||||
using System.Configuration.Internal;
|
||||
using System.IO;
|
||||
using Common.Logging;
|
||||
using Common.Logging.Configuration;
|
||||
using Common.Logging.Simple;
|
||||
using NUnit.Framework;
|
||||
using Spring.Util;
|
||||
@@ -44,7 +44,7 @@ namespace Spring.EnterpriseServices
|
||||
{
|
||||
ExeConfigurationSystem ccs = new ExeConfigurationSystem(exePath);
|
||||
prevConfig = ConfigurationUtils.SetConfigurationSystem(ccs, true);
|
||||
LogSetting settings = (LogSetting) ConfigurationManager.GetSection("common/logging");
|
||||
LogSetting settings = (LogSetting) ConfigurationManager.GetSection("logging");
|
||||
Assert.AreEqual(typeof (TraceLoggerFactoryAdapter), settings.FactoryAdapterType);
|
||||
|
||||
Assert.AreEqual("from custom config!", ConfigurationManager.AppSettings["key"]);
|
||||
|
||||
Reference in New Issue
Block a user