From 8508a860cce6dd03a7cd3f625eca8417a503f2a4 Mon Sep 17 00:00:00 2001
From: Louis DeJardin <Louis.DeJardin@microsoft.com>
Date: Thu, 15 Apr 2010 01:21:03 -0700
Subject: [PATCH] Incomplete commit

--HG--
branch : dev
---
 .../ShellBuilders/DefaultShellContextFactoryTests.cs          | 2 +-
 src/Orchard.Web/Core/Orchard.Core.csproj                      | 4 ++--
 .../Environment/ShellBuilders/DefaultShellContextFactory.cs   | 2 +-
 src/Orchard/Orchard.Framework.csproj                          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContextFactoryTests.cs b/src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContextFactoryTests.cs
index 886b5590b..bc3521a56 100644
--- a/src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContextFactoryTests.cs
+++ b/src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContextFactoryTests.cs
@@ -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);
 
diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj
index d4ea430dc..616799f63 100644
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -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" />
diff --git a/src/Orchard/Environment/ShellBuilders/DefaultShellContextFactory.cs b/src/Orchard/Environment/ShellBuilders/DefaultShellContextFactory.cs
index 6ea663e63..00eec8608 100644
--- a/src/Orchard/Environment/ShellBuilders/DefaultShellContextFactory.cs
+++ b/src/Orchard/Environment/ShellBuilders/DefaultShellContextFactory.cs
@@ -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();
             }
 
diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj
index cc073409e..930131333 100644
--- a/src/Orchard/Orchard.Framework.csproj
+++ b/src/Orchard/Orchard.Framework.csproj
@@ -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" />