lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Updating autofac module

Browse Source 
TODO: Need to upgrade the code which loads the autofac configuration from
the main config file, and also from tenant's satellite configs.

--HG--
branch : autofac3
This commit is contained in:
Sebastien Ros 2013-02-06 10:30:02 -08:00
parent f31bccac68
commit 05a499bc52
13 changed files with 479 additions and 263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/autofac/Autofac.Configuration.dll
View File

Binary file not shown.

BIN
lib/autofac/Autofac.Integration.Mef.dll
View File

Binary file not shown.

BIN
lib/autofac/Autofac.Integration.Mvc.dll
View File

Binary file not shown.

BIN
lib/autofac/Autofac.Integration.SignalR.dll Normal file
View File

Binary file not shown.

BIN
lib/autofac/Autofac.Integration.Wcf.dll
View File

Binary file not shown.

BIN
lib/autofac/Autofac.Integration.Web.dll
View File

Binary file not shown.

BIN
lib/autofac/Autofac.Integration.WebApi.dll Normal file
View File

Binary file not shown.

718
lib/autofac/Autofac.XML
View File

File diff suppressed because it is too large Load Diff

BIN
lib/autofac/Autofac.dll
View File

Binary file not shown.

2
lib/autofac/Autofac License.txt → lib/autofac/License.txt
View File

@ -1,5 +1,5 @@
Autofac IoC Container
Copyright (c) 2007-2010 Autofac Contributors
Copyright (c) 2007-2012 Autofac Contributors
http://code.google.com/p/autofac/wiki/Contributing
Other software included in this distribution is owned and

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; }
}

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

@ -119,13 +119,13 @@ namespace Orchard.Environment {
registrations(builder);
var autofacSection = ConfigurationManager.GetSection(ConfigurationSettingsReader.DefaultSectionName);
if (autofacSection != null)
builder.RegisterModule(new ConfigurationSettingsReader());
//var autofacSection = ConfigurationManager.GetSection(ConfigurationSettingsReader.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))

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

@ -123,13 +123,13 @@ namespace Orchard.Environment.ShellBuilders {
// Register code-only registrations specific to a shell
_shellContainerRegistrations.Registrations(builder);
var optionalShellConfig = HostingEnvironment.MapPath("~/Config/Sites.config");
if (File.Exists(optionalShellConfig))
builder.RegisterModule(new ConfigurationSettingsReader(ConfigurationSettingsReader.DefaultSectionName, optionalShellConfig));
//var optionalShellConfig = HostingEnvironment.MapPath("~/Config/Sites.config");
//if (File.Exists(optionalShellConfig))
// builder.RegisterModule(new ConfigurationSettingsReader(ConfigurationSettingsReader.DefaultSectionName, optionalShellConfig));
var optionalShellByNameConfig = HostingEnvironment.MapPath("~/Config/Sites." + settings.Name + ".config");
if (File.Exists(optionalShellByNameConfig))
builder.RegisterModule(new ConfigurationSettingsReader(ConfigurationSettingsReader.DefaultSectionName, optionalShellByNameConfig));
//var optionalShellByNameConfig = HostingEnvironment.MapPath("~/Config/Sites." + settings.Name + ".config");
//if (File.Exists(optionalShellByNameConfig))
// builder.RegisterModule(new ConfigurationSettingsReader(ConfigurationSettingsReader.DefaultSectionName, optionalShellByNameConfig));
});
}