Changing folder paths to follow namespaces

--HG--
branch : dev

src/Orchard.Specs/Bindings/OrchardSiteFactory.cs

@@ -2,8 +2,8 @@
 using System.Linq;
 using System.Text;
 using Orchard.Environment.Configuration;
-using Orchard.Environment.Blueprint;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor;
+using Orchard.Environment.Descriptor.Models;
 using Orchard.Specs.Hosting.Orchard.Web;
 using TechTalk.SpecFlow;
 

src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj

@@ -111,7 +111,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Roles\Controllers\AdminControllerTests.cs" />
     <Compile Include="Roles\Services\RoleServiceTests.cs" />
-    <Compile Include="Settings\Topology\ShellDescriptorManagerTests.cs" />
+    <Compile Include="Settings\Blueprint\ShellDescriptorManagerTests.cs" />
     <Compile Include="Values.cs" />
     <Compile Include="Users\Controllers\AdminControllerTests.cs" />
     <Compile Include="Users\Services\MembershipServiceTests.cs" />

src/Orchard.Tests.Modules/Settings/Blueprint/ShellDescriptorManagerTests.cs

@@ -7,8 +7,8 @@ using Orchard.Core.Settings.State;
 using Orchard.Core.Settings.Descriptor;
 using Orchard.Core.Settings.Descriptor.Records;
 using Orchard.Environment.State;
-using Orchard.Environment.Blueprint;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor;
+using Orchard.Environment.Descriptor.Models;
 using Orchard.Events;
 
 namespace Orchard.Tests.Modules.Settings.Blueprint {

src/Orchard.Tests/Data/Builders/SessionFactoryBuilderTests.cs

@@ -2,8 +2,9 @@
 using System.IO;
 using NUnit.Framework;
 using Orchard.Data.Builders;
-using Orchard.Environment.Blueprint;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor;
+using Orchard.Environment.Descriptor.Models;
+using Orchard.Environment.ShellBuilders.Models;
 using Orchard.Tests.Records;
 
 namespace Orchard.Tests.Data.Builders {

src/Orchard.Tests/DataUtility.cs

@@ -9,7 +9,8 @@ using NHibernate;
 using NHibernate.Tool.hbm2ddl;
 using Orchard.Data;
 using Orchard.Data.Builders;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor.Models;
+using Orchard.Environment.ShellBuilders.Models;
 
 namespace Orchard.Tests {
     public static class DataUtility {

src/Orchard.Tests/Environment/Blueprint/DefaultShellDescriptorCacheTests.cs

@@ -3,8 +3,8 @@ using System.Runtime.Serialization;
 using System.Xml;
 using Autofac;
 using NUnit.Framework;
-using Orchard.Environment.Blueprint;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor;
+using Orchard.Environment.Descriptor.Models;
 using Orchard.FileSystems.AppData;
 
 namespace Orchard.Tests.Environment.Blueprint {

src/Orchard.Tests/Environment/DefaultCompositionStrategyTests.cs

@@ -11,7 +11,8 @@ using Orchard.ContentManagement.Records;
 using Orchard.Environment.Configuration;
 using Orchard.Environment.Extensions;
 using Orchard.Environment.Extensions.Models;
-using Orchard.Environment.Blueprint;
+using Orchard.Environment.Descriptor;
+using Orchard.Environment.ShellBuilders;
 using Orchard.Tests.Environment.Utility;
 using Orchard.Tests.Records;
 using Orchard.Tests.Utility;

src/Orchard.Tests/Environment/DefaultOrchardHostTests.cs

@@ -16,8 +16,8 @@ using Orchard.Environment.Extensions;
 using Orchard.Environment.Extensions.Folders;
 using Orchard.Environment.Extensions.Models;
 using Orchard.Environment.ShellBuilders;
-using Orchard.Environment.Blueprint;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor;
+using Orchard.Environment.Descriptor.Models;
 using Orchard.FileSystems.AppData;
 using Orchard.Mvc;
 using Orchard.Mvc.ModelBinders;

src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContainerFactoryTests.cs

@@ -14,7 +14,8 @@ using Orchard.Environment.AutofacUtil.DynamicProxy2;
 using Orchard.Environment.Configuration;
 using Orchard.Environment.Extensions.Models;
 using Orchard.Environment.ShellBuilders;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor.Models;
+using Orchard.Environment.ShellBuilders.Models;
 
 namespace Orchard.Tests.Environment.ShellBuilders {
     [TestFixture]

src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContextFactoryTests.cs

@@ -5,8 +5,9 @@ using NUnit.Framework;
 using Orchard.Environment;
 using Orchard.Environment.Configuration;
 using Orchard.Environment.ShellBuilders;
-using Orchard.Environment.Blueprint;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor;
+using Orchard.Environment.Descriptor.Models;
+using Orchard.Environment.ShellBuilders.Models;
 using Orchard.Tests.Utility;
 
 namespace Orchard.Tests.Environment.ShellBuilders {

src/Orchard.Tests/Environment/State/DefaultProcessingEngineTests.cs

@@ -5,7 +5,7 @@ using NUnit.Framework;
 using Orchard.Environment.Configuration;
 using Orchard.Environment.ShellBuilders;
 using Orchard.Environment.State;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor.Models;
 using Orchard.Events;
 using Orchard.Tests.Utility;
 

src/Orchard.Tests/Environment/Utility/Build.cs

@@ -1,6 +1,6 @@
 using System.Linq;
 using Orchard.Environment.Extensions.Models;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor.Models;
 
 namespace Orchard.Tests.Environment.Utility {
     static class Build {

src/Orchard.Tests/Mvc/Routes/StandardExtensionRouteProviderTests.cs

@@ -6,7 +6,8 @@ using System.Web.Routing;
 using NUnit.Framework;
 using Orchard.Environment.Extensions;
 using Orchard.Environment.Extensions.Models;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor.Models;
+using Orchard.Environment.ShellBuilders.Models;
 using Orchard.Mvc.Routes;
 
 namespace Orchard.Tests.Mvc.Routes {

src/Orchard.Tests/Orchard.Framework.Tests.csproj

@@ -203,7 +203,7 @@
     <Compile Include="Stubs\StubWebSiteFolder.cs" />
     <Compile Include="Utility\ContainerExtensions.cs" />
     <Compile Include="Environment\TestDependencies\TestDependency.cs" />
-    <Compile Include="Environment\Topology\DefaultShellDescriptorCacheTests.cs" />
+    <Compile Include="Environment\Blueprint\DefaultShellDescriptorCacheTests.cs" />
     <Compile Include="EventsTests.cs" />
     <Compile Include="Events\EventTests.cs" />
     <Compile Include="Environment\Extensions\ExtensionFoldersTests.cs" />

src/Orchard.Web/Core/Orchard.Core.csproj

@@ -182,10 +182,10 @@
     <Compile Include="Settings\State\Records\ShellFeatureStateRecord.cs" />
     <Compile Include="Settings\State\Records\ShellStateRecord.cs" />
     <Compile Include="Settings\State\ShellStateManager.cs" />
-    <Compile Include="Settings\Topology\Records\ShellFeatureRecord.cs" />
-    <Compile Include="Settings\Topology\Records\ShellParameterRecord.cs" />
-    <Compile Include="Settings\Topology\Records\ShellDescriptorRecord.cs" />
-    <Compile Include="Settings\Topology\ShellDescriptorManager.cs" />
+    <Compile Include="Settings\Descriptor\Records\ShellFeatureRecord.cs" />
+    <Compile Include="Settings\Descriptor\Records\ShellParameterRecord.cs" />
+    <Compile Include="Settings\Descriptor\Records\ShellDescriptorRecord.cs" />
+    <Compile Include="Settings\Descriptor\ShellDescriptorManager.cs" />
     <Compile Include="Settings\AdminMenu.cs" />
     <Compile Include="Settings\Controllers\AdminController.cs" />
     <Compile Include="Settings\Handlers\SiteSettingsHandler.cs" />

src/Orchard.Web/Core/Settings/Descriptor/ShellDescriptorManager.cs

@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using Orchard.Core.Settings.Descriptor.Records;
 using Orchard.Data;
-using Orchard.Environment.Blueprint;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor;
+using Orchard.Environment.Descriptor.Models;
 using Orchard.Localization;
 
 namespace Orchard.Core.Settings.Descriptor {

src/Orchard.Web/Core/Settings/State/ShellStateManager.cs

@@ -3,7 +3,7 @@ using Orchard.Core.Settings.State.Records;
 using Orchard.Data;
 using Orchard.Environment.State;
 using Orchard.Environment.State.Models;
-using Orchard.Environment.Blueprint;
+using Orchard.Environment.Descriptor;
 using Orchard.Logging;
 
 namespace Orchard.Core.Settings.State {

src/Orchard.Web/Modules/Orchard.Modules/Services/ModuleService.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using System.Web;
 using Orchard.Environment.Extensions;
 using Orchard.Environment.Extensions.Models;
-using Orchard.Environment.Blueprint;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor;
+using Orchard.Environment.Descriptor.Models;
 using Orchard.Localization;
 using Orchard.Modules.Models;
 using Orchard.UI.Notify;

src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs

@@ -10,8 +10,8 @@ using Orchard.Data;
 using Orchard.Environment;
 using Orchard.Environment.Extensions;
 using Orchard.Environment.ShellBuilders;
-using Orchard.Environment.Blueprint;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor;
+using Orchard.Environment.Descriptor.Models;
 using Orchard.FileSystems.AppData;
 using Orchard.Security;
 using Orchard.Settings;

src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs

@@ -12,8 +12,8 @@ using Orchard.Data;
 using Orchard.Environment;
 using Orchard.Environment.Configuration;
 using Orchard.Environment.ShellBuilders;
-using Orchard.Environment.Blueprint;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor;
+using Orchard.Environment.Descriptor.Models;
 using Orchard.Localization;
 using Orchard.ContentManagement.MetaData.Services;
 using Orchard.Localization.Services;

src/Orchard/ContentManagement/Records/ContentItemAlteration.cs

@@ -8,8 +8,9 @@ using System.Reflection.Emit;
 using FluentNHibernate.Automapping;
 using FluentNHibernate.Automapping.Alterations;
 using JetBrains.Annotations;
-using Orchard.Environment.Blueprint;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor;
+using Orchard.Environment.Descriptor.Models;
+using Orchard.Environment.ShellBuilders.Models;
 
 namespace Orchard.ContentManagement.Records {
     class ContentItemAlteration : IAutoMappingAlteration {

src/Orchard/Data/Builders/AbstractBuilder.cs

@@ -11,8 +11,9 @@ using NHibernate.Cfg;
 using NHibernate.Tool.hbm2ddl;
 using Orchard.ContentManagement.Records;
 using Orchard.Data.Conventions;
-using Orchard.Environment.Blueprint;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor;
+using Orchard.Environment.Descriptor.Models;
+using Orchard.Environment.ShellBuilders.Models;
 
 namespace Orchard.Data.Builders {
     public abstract class AbstractBuilder {

src/Orchard/Data/Builders/ISessionFactoryBuilder.cs

@@ -1,7 +1,8 @@
 using System.Collections.Generic;
 using NHibernate;
-using Orchard.Environment.Blueprint;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor;
+using Orchard.Environment.Descriptor.Models;
+using Orchard.Environment.ShellBuilders.Models;
 
 namespace Orchard.Data.Builders {
 

src/Orchard/Data/Conventions/RecordTableNameConvention.cs

@@ -2,8 +2,9 @@ using System.Collections.Generic;
 using System.Linq;
 using FluentNHibernate.Conventions;
 using FluentNHibernate.Conventions.Instances;
-using Orchard.Environment.Blueprint;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor;
+using Orchard.Environment.Descriptor.Models;
+using Orchard.Environment.ShellBuilders.Models;
 
 namespace Orchard.Data.Conventions {
     public class RecordTableNameConvention : IClassConvention {

src/Orchard/Data/SessionFactoryHolder.cs

@@ -3,8 +3,9 @@ using System.IO;
 using NHibernate;
 using Orchard.Data.Builders;
 using Orchard.Environment.Configuration;
-using Orchard.Environment.Blueprint;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor;
+using Orchard.Environment.Descriptor.Models;
+using Orchard.Environment.ShellBuilders.Models;
 using Orchard.FileSystems.AppData;
 using Orchard.Logging;
 

src/Orchard/Environment/DefaultOrchardHost.cs

@@ -9,8 +9,8 @@ using Orchard.Environment.Configuration;
 using Orchard.Environment.Extensions;
 using Orchard.Environment.ShellBuilders;
 using Orchard.Environment.State;
-using Orchard.Environment.Blueprint;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor;
+using Orchard.Environment.Descriptor.Models;
 using Orchard.Logging;
 using Orchard.Mvc;
 using Orchard.Mvc.ViewEngines;

src/Orchard/Environment/Descriptor/IShellDescriptorManager.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor.Models;
 using Orchard.Events;
 
-namespace Orchard.Environment.Blueprint {
+namespace Orchard.Environment.Descriptor {
     /// <summary>
     /// Service resolved out of the shell container. Primarily used by host.
     /// </summary>

src/Orchard/Environment/Descriptor/Models/ShellDescriptor.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Orchard.Environment.Blueprint.Models {
+namespace Orchard.Environment.Descriptor.Models {
 
     /// <summary>
     /// Contains a snapshot of a tenant's enabled features.

src/Orchard/Environment/Descriptor/ShellDescriptorCache.cs

@@ -2,12 +2,12 @@
 using System.IO;
 using System.Runtime.Serialization;
 using System.Xml;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor.Models;
 using Orchard.FileSystems.AppData;
 using Orchard.Localization;
 using Orchard.Logging;
 
-namespace Orchard.Environment.Blueprint {
+namespace Orchard.Environment.Descriptor {
         /// <summary>
     /// Single service instance registered at the host level. Provides storage
     /// and recall of shell descriptor information. Default implementation uses

src/Orchard/Environment/IOrchardHost.cs

@@ -1,5 +1,5 @@
 using Orchard.Environment.Configuration;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor.Models;
 
 namespace Orchard.Environment {
     public interface IOrchardHost {

src/Orchard/Environment/OrchardStarter.cs

@@ -12,7 +12,7 @@ using Orchard.Environment.Extensions.Folders;
 using Orchard.Environment.Extensions.Loaders;
 using Orchard.Environment.ShellBuilders;
 using Orchard.Environment.State;
-using Orchard.Environment.Blueprint;
+using Orchard.Environment.Descriptor;
 using Orchard.Events;
 using Orchard.FileSystems.AppData;
 using Orchard.FileSystems.Dependencies;

src/Orchard/Environment/ShellBuilders/CompositionStrategy.cs

@@ -6,12 +6,13 @@ using System.Web.Mvc;
 using Autofac.Core;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Records;
-using Orchard.Environment.Blueprint.Models;
 using Orchard.Environment.Configuration;
+using Orchard.Environment.Descriptor.Models;
 using Orchard.Environment.Extensions;
 using Orchard.Environment.Extensions.Models;
+using Orchard.Environment.ShellBuilders.Models;
 
-namespace Orchard.Environment.Blueprint {
+namespace Orchard.Environment.ShellBuilders {
     /// <summary>
     /// Service at the host level to transform the cachable descriptor into the loadable blueprint.
     /// </summary>

src/Orchard/Environment/ShellBuilders/Models/ShellBlueprint.cs

@@ -1,8 +1,9 @@
 using System;
 using System.Collections.Generic;
+using Orchard.Environment.Descriptor.Models;
 using Orchard.Environment.Extensions.Models;
 
-namespace Orchard.Environment.Blueprint.Models {
+namespace Orchard.Environment.ShellBuilders.Models {
 
     /// <summary>
     /// Contains the information necessary to initialize an IoC container

src/Orchard/Environment/ShellBuilders/ShellContainerFactory.cs

@@ -11,7 +11,8 @@ using Autofac.Features.Indexed;
 using Autofac.Integration.Web.Mvc;
 using Orchard.Environment.AutofacUtil.DynamicProxy2;
 using Orchard.Environment.Configuration;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor.Models;
+using Orchard.Environment.ShellBuilders.Models;
 using Orchard.Events;
 
 namespace Orchard.Environment.ShellBuilders {

src/Orchard/Environment/ShellBuilders/ShellContext.cs

@@ -1,6 +1,7 @@
 using Autofac;
 using Orchard.Environment.Configuration;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor.Models;
+using Orchard.Environment.ShellBuilders.Models;
 
 namespace Orchard.Environment.ShellBuilders {
     public class ShellContext {

src/Orchard/Environment/ShellBuilders/ShellContextFactory.cs

@@ -2,8 +2,8 @@ using System;
 using System.Linq;
 using Autofac;
 using Orchard.Environment.Configuration;
-using Orchard.Environment.Blueprint;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor;
+using Orchard.Environment.Descriptor.Models;
 using Orchard.Logging;
 
 namespace Orchard.Environment.ShellBuilders {

src/Orchard/Environment/State/DefaultProcessingEngine.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Orchard.Environment.Configuration;
 using Orchard.Environment.ShellBuilders;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor.Models;
 using Orchard.Events;
 using Orchard.Logging;
 

src/Orchard/Environment/State/IProcessingEngine.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Orchard.Environment.Configuration;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor.Models;
 
 namespace Orchard.Environment.State
 {

src/Orchard/Environment/State/ShellStateCoordinator.cs

@@ -5,8 +5,8 @@ using Orchard.Environment.Configuration;
 using Orchard.Environment.Extensions;
 using Orchard.Environment.Extensions.Models;
 using Orchard.Environment.State.Models;
-using Orchard.Environment.Blueprint;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor;
+using Orchard.Environment.Descriptor.Models;
 
 namespace Orchard.Environment.State {
     public class ShellStateCoordinator : IShellStateManagerEventHandler, IShellDescriptorManagerEventHandler {

src/Orchard/Mvc/Routes/StandardExtensionRouteProvider.cs

@@ -3,7 +3,8 @@ using System.Linq;
 using System.Web.Mvc;
 using System.Web.Routing;
 using Orchard.Environment.Extensions;
-using Orchard.Environment.Blueprint.Models;
+using Orchard.Environment.Descriptor.Models;
+using Orchard.Environment.ShellBuilders.Models;
 
 namespace Orchard.Mvc.Routes {
     public class StandardExtensionRouteProvider : IRouteProvider {

src/Orchard/Orchard.Framework.csproj

@@ -390,7 +390,7 @@
     <Compile Include="Mvc\Routes\RoutePublisher.cs" />
     <Compile Include="Mvc\Routes\RouteDescriptor.cs" />
     <Compile Include="Data\Repository.cs" />
-    <Compile Include="Environment\Topology\CompositionStrategy.cs" />
+    <Compile Include="Environment\ShellBuilders\CompositionStrategy.cs" />
     <Compile Include="Environment\DefaultOrchardHost.cs" />
     <Compile Include="Mvc\OrchardControllerFactory.cs" />
     <Compile Include="Environment\IOrchardHost.cs" />
@@ -455,10 +455,10 @@
     <Compile Include="Environment\AutofacUtil\ContainerUpdater.cs" />
     <Compile Include="Environment\ShellBuilders\ShellContextFactory.cs" />
     <Compile Include="Environment\ShellBuilders\ShellContext.cs" />
-    <Compile Include="Environment\Topology\ShellDescriptorCache.cs" />
-    <Compile Include="Environment\Topology\IShellDescriptorManager.cs" />
-    <Compile Include="Environment\Topology\Models\ShellBlueprint.cs" />
-    <Compile Include="Environment\Topology\Models\ShellDescriptor.cs" />
+    <Compile Include="Environment\Descriptor\ShellDescriptorCache.cs" />
+    <Compile Include="Environment\Descriptor\IShellDescriptorManager.cs" />
+    <Compile Include="Environment\ShellBuilders\Models\ShellBlueprint.cs" />
+    <Compile Include="Environment\Descriptor\Models\ShellDescriptor.cs" />
     <Compile Include="Environment\ShellBuilders\ShellContainerFactory.cs" />
     <Compile Include="Environment\Configuration\ShellSettings.cs" />
     <Compile Include="Environment\StandaloneEnvironment.cs" />