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

Incomplete commit

Browse Source 
--HG--
branch : dev
This commit is contained in:
Louis DeJardin
2010-04-15 01:21:03 -07:00
parent aee044781c
commit 8508a860cc
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContextFactoryTests.cs
View File

@@ -45,7 +45,7 @@ namespace Orchard.Tests.Environment.ShellBuilders {
.Setup(x => x.CreateContainer(topology))
.Returns(shellLifetimeScope = _container.BeginLifetimeScope("shell"));
_container.Mock<ITopologyDescriptorProvider>()
_container.Mock<ITopologyDescriptorManager>()
.Setup(x => x.GetTopologyDescriptor())
.Returns(topologyDescriptor);

4
src/Orchard.Web/Core/Orchard.Core.csproj
View File

@@ -122,8 +122,9 @@
<Compile Include="Scheduling\Services\ScheduledTaskExecutor.cs" />
<Compile Include="Scheduling\Models\Task.cs" />
<Compile Include="Settings\Drivers\SiteSettingsDriver.cs" />
<Compile Include="Settings\Models\SiteSettingsRecord.cs" />
<Compile Include="Settings\Permissions.cs" />
<Compile Include="Settings\Services\TopologyDescriptorProvider.cs" />
<Compile Include="Settings\Services\TopologyDescriptorManager.cs" />
<Compile Include="Themes\DesignerNotes\ZoneManagerEvents.cs" />
<Compile Include="Themes\Preview\IPreviewTheme.cs" />
<Compile Include="Themes\Preview\PreviewThemeFilter.cs" />
@@ -133,7 +134,6 @@
<Compile Include="Settings\Controllers\AdminController.cs" />
<Compile Include="Settings\Handlers\SiteSettingsHandler.cs" />
<Compile Include="Settings\Models\SiteSettings.cs" />
<Compile Include="Settings\Models\SiteSettingsRecord.cs" />
<Compile Include="Settings\Services\SiteService.cs" />
<Compile Include="Settings\ViewModels\SettingsIndexViewModel.cs" />
<Compile Include="Themes\AdminMenu.cs" />

2
src/Orchard/Environment/ShellBuilders/DefaultShellContextFactory.cs
View File

@@ -27,7 +27,7 @@ namespace Orchard.Environment.ShellBuilders {
ShellTopologyDescriptor currentTopology;
using (var standaloneEnvironment = new StandaloneEnvironment(shellScope)) {
var topologyDescriptorProvider = standaloneEnvironment.Resolve<ITopologyDescriptorProvider>();
var topologyDescriptorProvider = standaloneEnvironment.Resolve<ITopologyDescriptorManager>();
currentTopology = topologyDescriptorProvider.GetTopologyDescriptor();
}

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

@@ -175,7 +175,7 @@
<Compile Include="Environment\ShellBuilders\ShellContext.cs" />
<Compile Include="Environment\Topology\DefaultTopologyDescriptorCache.cs" />
<Compile Include="Environment\Topology\ICompositionStrategy.cs" />
<Compile Include="Environment\Topology\ITopologyDescriptorProvider.cs" />
<Compile Include="Environment\Topology\ITopologyDescriptorManager.cs" />
<Compile Include="Environment\Topology\ITopologyDescriptorCache.cs" />
<Compile Include="Environment\Topology\Models\ShellTopology.cs" />
<Compile Include="Environment\Topology\Models\ShellTopologyDescriptor.cs" />