lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge with autofac3

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2013-03-07 15:19:18 -08:00
parent 57258ec8e8 c472c78b08
commit 05173e883b
33 changed files with 7023 additions and 1080 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Tests/Stubs/StubContainerProvider.cs
View File

@@ -12,7 +12,7 @@ namespace Orchard.Tests.Stubs {
RequestLifetime.Dispose();
}
public IContainer ApplicationContainer { get; set; }
public ILifetimeScope ApplicationContainer { get; set; }
public ILifetimeScope RequestLifetime { get; set; }
}

5
src/Orchard/Environment/AutofacUtil/ConfigurationSettingsReaderConstants.cs Normal file
View File

@@ -0,0 +1,5 @@
namespace Orchard.Environment.AutofacUtil {
public static class ConfigurationSettingsReaderConstants {
public const string DefaultSectionName = "autofac";
}
}

1
src/Orchard/Environment/AutofacUtil/LifetimeScopeContainer.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using Autofac;
using Autofac.Configuration;
using Autofac.Core;
using Autofac.Core.Lifetime;
using Autofac.Core.Resolving;

5
src/Orchard/Environment/OrchardStarter.cs
View File

@@ -9,6 +9,7 @@ using System.Web.Mvc;
using Autofac;
using Autofac.Configuration;
using Orchard.Caching;
using Orchard.Environment.AutofacUtil;
using Orchard.Environment.Configuration;
using Orchard.Environment.Extensions;
using Orchard.Environment.Extensions.Compilers;
@@ -119,13 +120,13 @@ namespace Orchard.Environment {
registrations(builder);
var autofacSection = ConfigurationManager.GetSection(ConfigurationSettingsReader.DefaultSectionName);
var autofacSection = ConfigurationManager.GetSection(ConfigurationSettingsReaderConstants.DefaultSectionName);
if (autofacSection != null)
builder.RegisterModule(new ConfigurationSettingsReader());
var optionalHostConfig = HostingEnvironment.MapPath("~/Config/Host.config");
if (File.Exists(optionalHostConfig))
builder.RegisterModule(new ConfigurationSettingsReader(ConfigurationSettingsReader.DefaultSectionName, optionalHostConfig));
builder.RegisterModule(new ConfigurationSettingsReader(optionalHostConfig));
var optionalComponentsConfig = HostingEnvironment.MapPath("~/Config/HostComponents.config");
if (File.Exists(optionalComponentsConfig))

5
src/Orchard/Environment/ShellBuilders/ShellContainerFactory.cs
View File

@@ -9,6 +9,7 @@ using Autofac.Builder;
using Autofac.Configuration;
using Autofac.Core;
using Autofac.Features.Indexed;
using Orchard.Environment.AutofacUtil;
using Orchard.Environment.AutofacUtil.DynamicProxy2;
using Orchard.Environment.Configuration;
using Orchard.Environment.ShellBuilders.Models;
@@ -133,11 +134,11 @@ namespace Orchard.Environment.ShellBuilders {
var optionalShellConfig = HostingEnvironment.MapPath("~/Config/Sites.config");
if (File.Exists(optionalShellConfig))
builder.RegisterModule(new ConfigurationSettingsReader(ConfigurationSettingsReader.DefaultSectionName, optionalShellConfig));
builder.RegisterModule(new ConfigurationSettingsReader(ConfigurationSettingsReaderConstants.DefaultSectionName, optionalShellConfig));
var optionalShellByNameConfig = HostingEnvironment.MapPath("~/Config/Sites." + settings.Name + ".config");
if (File.Exists(optionalShellByNameConfig))
builder.RegisterModule(new ConfigurationSettingsReader(ConfigurationSettingsReader.DefaultSectionName, optionalShellByNameConfig));
builder.RegisterModule(new ConfigurationSettingsReader(ConfigurationSettingsReaderConstants.DefaultSectionName, optionalShellByNameConfig));
});
}

1
src/Orchard/Orchard.Framework.csproj
View File

@@ -201,6 +201,7 @@
<Compile Include="DisplayManagement\Shapes\Composite.cs" />
<Compile Include="DisplayManagement\Shapes\ShapeDebugView.cs" />
<Compile Include="DisplayManagement\Shapes\ITagBuilderFactory.cs" />
<Compile Include="Environment\AutofacUtil\ConfigurationSettingsReaderConstants.cs" />
<Compile Include="Environment\CollectionOrderModule.cs" />
<Compile Include="Caching\DefaultAsyncTokenProvider.cs" />
<Compile Include="Environment\Configuration\ShellSettingsSerializer.cs" />