Other context type support

.gitignore

@@ -8,4 +8,5 @@ build/Output
 test-results
 .idea
 output/
-.vs
+.vs
+packages

README.md

@@ -63,6 +63,28 @@ or compile from sources available on Git: `git clone git://github.com/Suremaker/
 * [Dependency check](https://github.com/Suremaker/Spring.FluentContext/wiki/Dependency-checking)
 * [Type-safe, literal-less references](https://github.com/Suremaker/Spring.FluentContext/wiki/Object-definition-registration)
 
+## Extenstion methods
+
+Fluent configuration extracted to extension methods, so it can be used with any context implementing `IConfigurableApplicationContext`. Unfortunately, most of them have their core logic in constructors so simply registering objects is not enoguh.
+Eg. for proper usage of `XmlApplicationContext` you need to instantiate `FluentXmlApplicationContext` with a configurator class implementing `IContextConfigurator` which is called during building base context. Not a nice solution, but only possible without changing core *Spring.Net* repo.
+
+## Web support
+
+Inside `Spring.FluentContext.Web` project there is a `FluentWebApplicationContext` which can be initialized using `FluentWebContextHandler`. Sample configuration in *web.config*:
+
+```xml
+<configuration>
+  <configSections>
+    <sectionGroup name="spring">
+       <section name="context" type="Spring.FluentContext.Web.FluentWebContextHandler, Spring.FluentContext.Web" /> 
+    </sectionGroup>
+  </configSections>
+  <appSettings>
+    <add key="SpringConfigurator" value="WebClient.Mobile.Config.SpringFluentConfig, WebClient.Mobile" />
+  </appSettings>
+</configuration>
+```
+
 ## Not Implemented Features
 * lazy and non-lazy initialization (now everything is initialized lazily)
 

Spring.FluentContext.Examples/Spring.FluentContext.Examples.csproj

@@ -1,10 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net461;netcoreapp2.2</TargetFrameworks>
-    <Copyright>Copyright © 2012-2019, Wojciech Kotlarski</Copyright>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.FluentContext\Spring.FluentContext.csproj" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>net462;net6.0</TargetFrameworks>
+    <Copyright>Copyright © 2012-2019, Wojciech Kotlarski</Copyright>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.FluentContext\Spring.FluentContext.csproj" />
+  </ItemGroup>
 </Project>

Spring.FluentContext.UnitTests/Spring.FluentContext.UnitTests.csproj

@@ -1,17 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.2;net45</TargetFrameworks>
-    <IsPackable>false</IsPackable>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Spring.FluentContext\Spring.FluentContext.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="NUnit" Version="3.7.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.11.2" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>net6.0;net462</TargetFrameworks>
+    <IsPackable>false</IsPackable>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.FluentContext\Spring.FluentContext.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+  </ItemGroup>
 </Project>

Spring.FluentContext.Web/FluentWebApplicationContext.cs

@@ -0,0 +1,79 @@
+using System;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Objects.Factory.Config;
+using Spring.Objects.Factory.Support;
+
+namespace Spring.FluentContext.Web
+{
+    public class FluentWebApplicationContext : WebApplicationContext
+    {
+        public const string SpringConfiguratorKey = "SpringConfigurator";
+        private IContextConfigurator _configurator;
+
+        #region Constructors
+
+        /// <summary>
+        /// Create a new WebApplicationContext, loading the definitions
+        /// from the given XML resource.
+        /// </summary>
+        /// <param name="configurationLocations">Names of configuration resources.</param>
+        public FluentWebApplicationContext(params string[] configurationLocations)
+            : base(new WebApplicationContextArgs(string.Empty, null, configurationLocations, null, false))
+        {
+        }
+
+        /// <summary>
+        /// Create a new WebApplicationContext, loading the definitions
+        /// from the given XML resource.
+        /// </summary>
+        /// <param name="name">The application context name.</param>
+        /// <param name="caseSensitive">Flag specifying whether to make this context case sensitive or not.</param>
+        /// <param name="configurationLocations">Names of configuration resources.</param>
+        public FluentWebApplicationContext(string name, bool caseSensitive, params string[] configurationLocations)
+            : base(new WebApplicationContextArgs(name, null, configurationLocations, null, caseSensitive))
+        {
+        }
+
+        /// <summary>
+        /// Create a new WebApplicationContext with the given parent,
+        /// loading the definitions from the given XML resources.
+        /// </summary>
+        /// <param name="name">The application context name.</param>
+        /// <param name="caseSensitive">Flag specifying whether to make this context case sensitive or not.</param>
+        /// <param name="parentContext">The parent context.</param>
+        /// <param name="configurationLocations">Names of configuration resources.</param>
+        public FluentWebApplicationContext(string name, bool caseSensitive, IApplicationContext parentContext,
+                                     params string[] configurationLocations)
+            : base(new WebApplicationContextArgs(name, parentContext, configurationLocations, null, caseSensitive))
+        { }
+        #endregion
+
+        protected override void OnPreRefresh()
+        {
+            const string prefix = SpringConfiguratorKey + ProtocolSeparator;
+
+            for (int i = 0; i < ConfigurationLocations.Length; i++)
+            {
+                if (ConfigurationLocations[i].StartsWith(prefix))
+                {
+                    string configuratorName = ConfigurationLocations[i].Substring(prefix.Length);
+                    ConfigurationLocations[i] = "assembly://Spring.FluentContext.Web/Spring.FluentContext.Web/emptyContext.xml";
+                    _configurator = (IContextConfigurator) Activator.CreateInstance(Type.GetType(configuratorName));
+                    break; // only one configurator supported
+                }
+            }
+            base.OnPreRefresh();
+        }
+
+        /// <summary>
+        /// This method registers Fluent objects and calls base post processing
+        /// </summary>
+        /// <param name="objectFactory"></param>
+        protected override void PostProcessObjectFactory(IConfigurableListableObjectFactory objectFactory)
+        {
+            _configurator?.LoadObjectDefinitions(this);
+            base.PostProcessObjectFactory(objectFactory);
+        }
+    }
+}

Spring.FluentContext.Web/FluentWebContextHandler.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using Common.Logging;
+using Spring.Context;
+using Spring.Context.Support;
+using Spring.Core.IO;
+
+namespace Spring.FluentContext.Web
+{
+    public class FluentWebContextHandler : WebContextHandler
+    {
+        private static readonly ILog Log = LogManager.GetLogger(typeof(WebContextHandler));
+        private readonly string _configurator;
+
+        public FluentWebContextHandler()
+        {
+            _configurator = ConfigurationManager.AppSettings["SpringConfigurator"];
+        }
+
+        /// <summary>
+        /// Sets default context type to <see cref="FluentWebApplicationContext"/>
+        /// </summary>
+        protected override Type DefaultApplicationContextType
+        {
+            get { return typeof(FluentWebApplicationContext); }
+        }
+
+        /// <summary>
+        /// Handles web specific details of context instantiation.
+        /// </summary>
+        protected override IApplicationContext InstantiateContext(IApplicationContext parent, object configContext,
+            string contextName, Type contextType, bool caseSensitive, IList<string> resources)
+        {
+            string[] resourcesArray = resources.Union(
+                string.IsNullOrWhiteSpace(_configurator)
+                    ? new string[0]
+                    : new[]
+                    {
+                        FluentWebApplicationContext.SpringConfiguratorKey +
+                        ConfigurableResourceLoader.ProtocolSeparator + _configurator
+                    }).ToArray();
+
+            return base.InstantiateContext(parent, configContext, contextName, contextType, caseSensitive,
+                resourcesArray);
+        }       
+    }
+}

Spring.FluentContext.Web/Spring.FluentContext.Web.csproj

@@ -0,0 +1,33 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net462</TargetFramework>
+    <Description>Allows creating Spring.NET IoC container from code using fluent API</Description>
+    <Copyright>Copyright © 2012-2019, Wojciech Kotlarski</Copyright>
+    <Authors>Wojciech Kotlarski</Authors>
+    <PackageProjectUrl>https://github.com/Suremaker/Spring.FluentContext</PackageProjectUrl>
+    <Version>3.0.0</Version>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/Suremaker/Spring.FluentContext</RepositoryUrl>
+    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+    <IncludeSymbols>True</IncludeSymbols>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+    <PackageOutputPath>$(SolutionDir)\output</PackageOutputPath>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <IsPackable>true</IsPackable>
+    <LangVersion>latest</LangVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Spring.Web" Version="3.0.1" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Web" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Spring.FluentContext\Spring.FluentContext.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Remove="emptyContext.xml" />
+    <EmbeddedResource Include="emptyContext.xml" />
+  </ItemGroup>
+</Project>

Spring.FluentContext.Web/emptyContext.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<objects xmlns="http://www.springframework.net" />